769
you are viewing a single comment's thread
view the rest of the comments
[-] Johanno@feddit.de 12 points 1 year ago
[-] foxymulder@lemmy.ml 39 points 1 year ago

"patch mode" - Patch mode allows you to stage parts of a changed file, instead of the entire file. This allows you to make concise, well-crafted commits that make for an easier to read history.

Highly recommend throwing --patch on any git commands you're used to using. You will have the prettiest, most atomic fkn commit, I'm serious people will love you for it.

I mean many people won't care, but the quality folk will notice and approve.

[-] Johanno@feddit.de 6 points 1 year ago

We make a singular commit per feature.

[-] KairuByte@lemmy.dbzer0.com 4 points 1 year ago

I always find this hard to follow personally.

Trunk based, eh? Yeah, we do that on a couple teams where I'm at, too. I like the philosophy, but force pushing the same commit over and over as you're incorporating review feedback is antisocial, especially when you've got devs trying to test your changes out on their machines.

[-] Omgpwnies@lemmy.world 3 points 1 year ago

eh, just squash and merge. Feature branch can be messy as long as main is clean

[-] Johanno@feddit.de 1 points 1 year ago

Yep. You have to make sure your feature branch works.

[-] oce@jlai.lu 4 points 1 year ago* (last edited 1 year ago)

Or just use a good IDE that makes doing atomic commits pretty natural.

I've only tried the VS code hunk stager thing, and found it cumbersome compared to command line, but if you can make a GUI work for you ya go for it. I've never found it worth the trouble personally

[-] dukk@programming.dev 3 points 1 year ago

Shout out to Lazygit for letting me stage individual lines

Looks pretty neat. I like that it shows the commands it's issuing!

[-] oce@jlai.lu 2 points 1 year ago

You should try the JetBrains IDEs, as the other said, you can pick changes line by line graphically, when you commit, when you do a diff with another branch or when you fix conflicts. It's much more convenient than commands and terminal text editors.

[-] AnarchistArtificer@lemmy.world 3 points 1 year ago

Yay, learning!

this post was submitted on 12 Dec 2023
769 points (99.0% liked)

Programmer Humor

19817 readers
601 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 2 years ago
MODERATORS