Take the 2-minute tour ×
Programmers Stack Exchange is a question and answer site for professional programmers interested in conceptual questions about software development. It's 100% free, no registration required.

If there are two unrelated tasks, except that the changes are in the same project, and end up touching at least one of the same classes/methods, how do I manage that?

Two different developers could each pick up one task. Each dev will create a new branch off of Integration, work in it, then need to Merge.

When Merging two branches, most of the time "Take Source Branch" is proper for Up-Merging, and "Take Target Branch" is proper for Back-Merging.

But when Back-Merging, or dual-merging up, there could be conflicts which overwrite the code of the previously merged project if they both changed the same class/method.

One answer is: "So only let one dev work on both tasks sequentially." Except that we're in SCRUM and any dev can pick up any task. We don't want to start assigning.

Another answer is: "Have the devs get together and hash out how to manually merge some stuff." But that's work! Lol. Is there a method I'm missing?

share|improve this question
2  
Automatic merges can't do everything. Sometimes you just have to go and manually figure out what code belongs. –  Steven Burnap Mar 11 at 23:20

1 Answer 1

up vote 3 down vote accepted

You have answered your own question:

Another answer is: "Have the devs get together and hash out how to manually merge some stuff."

That's the only way to resolve this sort of merge conflict. Assuming you don't have rogue developers forking your project, as a team you will have to agree what is the correct result of merging independent work.

There is no magic bullet that will resolve conflicting merges. It's work.

share|improve this answer
    
Thanks. I think everybody would wish for a magic bullet in a lot of scenarios. I think the Merge tool actually is pretty dam intelligent, but these scenarios are rare (but happen). I think it just needed to be said that the manual-hash was the requirement. I certainly prefer that option over breaking SCRUM. –  Suamere Mar 12 at 15:24

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.