Why does Launchpad think my merge request has conflicts?
My request to merge lp:~a7x/lightdm/multiseat into lp:lightdm [1] is currently showing lots of conflicts. As described in a comment [2], the commit history graph is (currently) purely linear; there are no forks or merges. It looks like this:
* <- lp:~a7x/lightdm/multiseat
|
*
|
(etc)
|
* <- lp:~a7x/lightdm/multiseat-logging
|
*
|
(etc)
|
* <- lp:~a7x/lightdm/seatunity-call-parent
|
* <- lp:lightdm (1.7.9)
|
(etc)
Since the tip commit of lp:~a7x/lightdm/multiseat is a descendant of the tip commit of lp:lightdm (as of this writing), it's impossible for there to be a merge conflict. So why does Launchpad think there is a conflict?
Note that lp:~a7x/lightdm/multiseat started out branched off of an older lp:lightdm commit. Based on feedback, I decided to rebase (NOT merge) my commits onto the latest lp:lightdm tip commit. I used 'bzr push --overwrite' (actually 'git bzr push --overwrite' since I'm much more comfortable using git with git-bzr-ng) to force the rebased commits into lp:~a7x/lightdm/multiseat. Might this rebasing have confused Launchpad?
[1] https:/
[2] https:/
Question information
- Language:
- English Edit question
- Status:
- Solved
- Assignee:
- No assignee Edit question
- Solved by:
- Steve Kowalik
- Solved:
- Last query:
- Last reply: