News for hackers. Stuff that matters.

A comment on Key Git Concepts Explained the Hard Way. Parent comment

Re:Key Git Concepts Explained the Hard Way by cousin_it on Wednesday March 14, 2018 @08:21PM (#16589555)
> At least in the case of Perforce, the fact people didn't use branches forced them to put all of a feature into a changeset (Perforce's closest equivalent to a commit), which was usually way too much; this results in multiple, distinct changes being squashed together.

First add a feature flag for your feature, then you can have as many small changelists as you like.

[ Parent | on HN ]
Re:Key Git Concepts Explained the Hard Way by fyi1183 on Thursday March 15, 2018 @04:03AM (#16591106)
This doesn't help at all with deep refactoring. The "git way" of producing small, self-contained changes covers all possible changes, not just feature additions.
[ Parent | on HN ]
Re:Key Git Concepts Explained the Hard Way by cousin_it on Thursday March 15, 2018 @05:43AM (#16591451)
Good point, thanks! In my experience all big refactorings (short of a rewrite) can be done incrementally if you're clever enough, and that has a lot of benefits. But maybe doing them in another branch is a valid approach too.
[ Parent | on HN ]