Ask HN: How often do you have merge conflicts?

Re:Ask HN: How often do you have merge conflicts? by swalberg on Sunday September 09, 2012 @10:03AM (#4495792)

We get them regularly, maybe a couple a week. But for the most part you know what you are getting into. It usually comes up in code review that there's going to be a problem.

What I don't get though is how a realtime notification would help me. If my editor started flashing that I was in conflict, what would I do differently?

[ Parent | on HN ]

Re:Ask HN: How often do you have merge conflicts? by seyz on Sunday September 09, 2012 @10:07AM (#4495799)

If you are notified in realtime, the merge conflict will be based on approximatively 1 line. It's easier to resolve it.

Suppose the "developer 1" working on a big feature during two weeks and a "developer 2" working on another big feature. If you detect the merge conflict at the end of the sprint, it can be difficult to resolve. Don't you think ?

[ Parent | on HN ]

Re:Ask HN: How often do you have merge conflicts? by swalberg on Sunday September 09, 2012 @10:16AM (#4495820)

Maybe the nature of our conflicts is different. Resolving things at the end is rarely that big of a hassle for us. I'd rather do it all at once after I'm done the work than interrupt my train of thought to fix it at the time.

[ Parent | on HN ]

Re:Ask HN: How often do you have merge conflicts? by seyz on Sunday September 09, 2012 @10:30AM (#4495861)

Ok great. Thanks for your comments. Can I ask you how much developers (approximatively) work on your company ?

[ Parent | on HN ]

Re:Ask HN: How often do you have merge conflicts? by swalberg on Sunday September 09, 2012 @04:17PM (#4496853)

On my team, 6. On another team, 20ish.

[ Parent | on HN ]