Conversation

Notices

1. Embed this notice
   Christoffer S. (nopatience@swecyb.com)'s status on Wednesday, 19-Feb-2025 19:41:49 JST Christoffer S.

   I'm a complete noob when it comes to source code management through git (one developer only).

   Are there any good "for dummies" resources with clear and systematic workflows for how a single developer can work?

   I'm trying to wrap my head around "branching/committing" often, tags and what not.

   Right now I'm doing something wrong because I'm getting PRs on my own repo, I don't get it.

   Need to learn.

   #Git #SourceCode #Single #Developer #Python

   • Embed this notice
     Aral Balkan (aral@mastodon.ar.al)'s status on Wednesday, 19-Feb-2025 19:41:46 JST Aral Balkan

     in reply to

     • Oliver

     @nopatience @oliver Can highly recommend using Sublime Merge. I’m perfectly comfortable with regular git use via terminal and have been for yonks but Sublime Merge has its own monitor while I’m working and I get instant diffs. And it’s great for making focussed commits (just this hunk or just these lines) and for daily time travel (e.g., let’s go back to this commit and treat changes since as staged, etc.)

   • Embed this notice
     Aral Balkan (aral@mastodon.ar.al)'s status on Wednesday, 19-Feb-2025 19:44:22 JST Aral Balkan

     in reply to

     • Oliver

     @nopatience @oliver PS. You’re getting PRs? Is this on GitHub? Are you sure you’re not just working on a branch and, when you push updates to it, GitHub is asking you if you want to create a PR? (Codeberg, which I use, does that at least; don’t remember if GitHub did, it’s been a while.)

     (Git has no concept of PRs. That’s a GitHub/git host construct.)

   • Embed this notice
     Aral Balkan (aral@mastodon.ar.al)'s status on Wednesday, 19-Feb-2025 23:42:48 JST Aral Balkan

     in reply to

     @nopatience No worries :)

     So, just to confirm: you have Projects A that’s, say, on Computer X and Y. In GitHub/Codeberg/etc., you have a remote R.

     You makes changes to A on X and push your main branch to R. You go on Y and pull from R; your main branch updates.

     If you’re not on main, you might see prompts to create a pull request from the latest push to a feature branch. That’s nothing to worry about and you can ignore it. It should go away when you merge that feature branch into main.

     Hope that helps and doesn’t confuse it further :)

   • Embed this notice
     Christoffer S. (nopatience@swecyb.com)'s status on Wednesday, 19-Feb-2025 23:42:50 JST Christoffer S.

     in reply to

     • Aral Balkan

     @aral Yeah, sorry... I should have made that clear.

     I do have some basic "skills" in using git for local versioning, but because I also split my work between two computers I wanted to a reasonably simple way of getting the source code synced between devices using git. I have used syncthing previously but found myself more times than I'd like with some incomplete syncs between devices.

     So the PRs is when i push to git, probably (very likely) incorrectly.

   • Embed this notice
     Aral Balkan (aral@mastodon.ar.al)'s status on Wednesday, 19-Feb-2025 23:43:33 JST Aral Balkan

     in reply to

     @nopatience 👍

   • Embed this notice
     Christoffer S. (nopatience@swecyb.com)'s status on Wednesday, 19-Feb-2025 23:43:35 JST Christoffer S.

     in reply to

     • Aral Balkan

     @aral ... and I just realized that before switching to nvim as my main editor, I used Sublime Text AND Merge.

     I probably have a license around here somewhere... that's a good idea, I could use Sublime Merge for git management, and continue my nvim usage.

     Thanks for reminding me about Merge 🙂