Best practice when conflicts arise in a merge request.

Asked by Haggai Eran


I was wondering what is the best way to handle conflicts as they sometimes arise in merge requests. Suppose I've developed a topic branch, and created a merge request trying to merge it with the trunk. SupIf I understand correctly, I can either:
1. Merge the trunk's changes, resolve the conflicts and push to the topic branch.
2. Rebase the topic branch over the trunk, resolve the conflicts, and force-push to the same branch on launchpad.
3. Rebase the topic branch, and push it to a new branch on launchpad.

I understand that in some cases the first two options can confuse launchpad. What do you think is the best way to handle this situation?

Question information

English Edit question
Launchpad itself Edit question
No assignee Edit question
Solved by:
William Grant
Last query:
Last reply:
Revision history for this message
William Grant (wgrant) said :

Option 1 is the normal solution. Why do you think it will confuse Launchpad?

Revision history for this message
Haggai Eran (haggai-eran) said :

I'm not sure I remember the exact branch that caused these problems, but I remember something like bugs that were already in status 'Fix Released' changing to 'Fix committed' because the merged part of the trunk had fixes for them. Perhaps it was a bug that was already solved.

Revision history for this message
Best William Grant (wgrant) said :

Hmm, that should never have been possible. Merge proposal have never changed the state of bugs.

Revision history for this message
Haggai Eran (haggai-eran) said :

Okay, thanks!