News for hackers. Stuff that matters.
Re:Linus on git rebase and merge (2009) by Peaker on Tuesday July 30, 2013 @07:19PM (#6130780)
Continuous integration, or frequently pulling, has huge advantages:

* Breakage is localized to small merges. Instead of debugging the breakage of 1 month of work integrated with yours, you debug it a day of work at a time. Localized/differential debugging is much easier.

* Ditto with conflicts. Dealing with daily conflicts is much easier than dealing with the aggregate of a month's conflict. Beyond a certain threshold of difficulty, conflict resolution quality becomes very low. People just give up and start resolving conflicts semi-randomly.

There are no comments on this comment yet.