News for hackers. Stuff that matters.
Re:Ask HN: How often do you have merge conflicts? by bkanber on Sunday September 09, 2012 @09:28AM (#4495717)
Small team manager here -- not often at all. Most people are working on different components simultaneously so conflicts rarely arise.
Re:Ask HN: How often do you have merge conflicts? by seyz on Sunday September 09, 2012 @09:44AM (#4495759)
Yes. I'm pretty sure that if you have a perfect organization in your team work, there's no need to have a tool like that.

Personally, I already create a merge conflict... alone :-) But it's because I am (was ? I hope...) not well organized.