MR changes fail to load when source/target branch is deleted and MR has conflicts
Background
While testing out conflicts feature on my test project (patrickbajao/conflicts!13 (diffs)), found out a case wherein source branch was deleted and the MR has conflicts, the MR changes will fail to load. The diffs_batch.json
and diffs_metadata.json
returns a 500 response.
Proposal
Check if source/target branch exists when requesting Gitaly for conflicts.
Edited by Patrick Bajao