Commit often, perfect later, publish once: Git best practices (2013)

Re:Commit often, perfect later, publish once: Git best pract... by marton78 on Sunday July 04, 2021 @08:57AM (#27729287)

I agree with this advice in spirit, but I prefer rebasing regularly onto master, rather than merging. Especially in a long lived branch this keeps the list of changes small. Imagine that someone performed a huge refactor in master, which conflicts with some small thing you did in your branch. If doesn't help to have another commit of the huge refactor in your history: the merge commit. I very much prefer to see only the logical changes I did in my branch.

[ Parent | on HN ]

Re:Commit often, perfect later, publish once: Git best pract... by ChrisMarshallNY on Sunday July 04, 2021 @09:16AM (#27729400)

That makes sense, as long as the work I do isn't that "huge refactor," for someone else.

[ Parent | on HN ]