←back to thread

Good Software Development Habits

(zarar.dev)
361 points mmphosis | 1 comments | 17 Nov 24 16:34 UTC | HN request time: 0.214s | source
Show context
simonw ◴[17 Nov 24 18:17 UTC] No.42165792[source]▶
On commit size:

> You just never know when you have to revert a particular change and there's a sense of bliss knowing where you introduced a bug six days ago and only reverting that commit without going through the savagery of merge conflicts.

This is key for me: a good shape to aim for with a commit is one that can be easily reverted.

replies(7): >>42165815 #>>42166356 #>>42166417 #>>42166427 #>>42166824 #>>42167218 #>>42167574 #
charles_f ◴[17 Nov 24 18:21 UTC] No.42165815[source]▶
A trick to help doing that, when you start having multiple changes that could be distinct commits, use git add --patch to select the changes one by one. Not only that can allow you to create smaller changes, it also gives you an opportunity to review your code before you commit
replies(2): >>42165883 #>>42167379 #
1. necovek ◴[17 Nov 24 21:19 UTC] No.42167379[source]▶
Also look up at any one of the "stacked branches" approaches (plenty of git extensions or tutorials that work natively with newer git versions).

For those still in bzr land, there used to be a wonderful "bzr-pipelines" plugin to enable seamlessly working on a set of interdependent changes.