Stop MR conflict code from blowing up when branches are missing

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/32544

I'll create a separate MR for %9.2 since some refactoring happened in the mean time.

added 1 commit

• 15be5d97 - Stop MR conflict code from blowing up when branches are missing

Compare with previous version

mentioned in merge request !11502 (merged)

@DouweM Both this and the 9-2-stable version have a changelog entry, so it will show up in 9.2 and 9.3. Is this something that was added and broken in 9.2? Does it need an entry at all?

@rspeicher Broken in 9.2, so you're right, it doesn't need a changelog item! I'm removing it.

added 1 commit

• 7a7e9288 - Stop MR conflict code from blowing up when branches are missing

Compare with previous version

approved this merge request

merged

mentioned in commit bcc504d3

mentioned in issue #32437 (closed)

mentioned in issue #32479 (closed)