Launchpad itself

Diff in apport merge request is malformed

Asked by Benjamin Drung

The diff shown in https://code.launchpad.net/~ubuntu-core-dev/ubuntu/+source/apport/+git/apport/+merge/458507/ shows "<<<<<<<"/"======="/">>>>>>>". Is that a known bug?

Question information

Language:
English Edit question
Status:
Solved
For:
Launchpad itself Edit question
Assignee:
No assignee Edit question
Solved by:
Benjamin Drung
Solved:
Last query:
Last reply:
Revision history for this message
Ines Almeida (ines-almeida) said : 		#1

That usually happens when there are conflicts between your branch vs. target branch.

Looking into them, their history seems to diverge: my guess is that there are probably different commits in both branches that change the same sections of files, which creates the conflicts.

Can you verify that the target branch is correct? If it is, you'll need to solve the conflicts locally

Revision history for this message
Benjamin Drung (bdrung) said : 		#2

Thanks. That information helped. After some more confusion, I figured out that the target branch was wrong (~git-ubuntu-import instead ~ubuntu-core-dev). After fixing the target branch, the diff looks good/correct.