News for hackers. Stuff that matters.
Re:Ask HN: How often do you have merge conflicts? by ZachWick on Sunday September 09, 2012 @10:02AM (#4495790)
Small team (~10) of developers: I rarely encounter merge conflicts due to our method of doling out tasks. We generally try to group tasks together based on similarities, and our codebase is very modular.
Re:Ask HN: How often do you have merge conflicts? by seyz on Sunday September 09, 2012 @10:09AM (#4495803)
Great. Thanks for this comment.