News for hackers. Stuff that matters.
Re:GitFlow considered harmful by hayd on Friday June 19, 2015 @07:58PM (#9748377)
Whilst this is occasionally useful, it's best avoided in my opinion as it's incredibly difficult to review a merge commit (especially a large merge commit).

(Most of the time I'd advocate, if you have to do larger project branches, either merging work in piecemeal asap e.g. hidden behind a flag or whatever, or keeping work in new files so that merge conflicts are kept to a minimum.)

There are no comments on this comment yet.