Skip to content
GitLab Next
  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • GitLab FOSS GitLab FOSS
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.org
  • GitLab FOSSGitLab FOSS
  • Merge requests
  • !6082

Fix resolving conflicts on forks

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Sean McGivern requested to merge 21459-resolving-merge-conflicts-from-a-forked-repo-through-ui into master Aug 29, 2016
  • Overview 21
  • Commits 2
  • Pipelines 1
  • Changes 4

What does this MR do?

When we resolve conflicts, we create a merge commit in the source branch with parents [source_branch_head, target_branch_head]. But when the MR is from a fork, target_branch_head might not exist in the source repo at all, so we need to fetch it if it isn't there. We can do this locally so it should be fast.

Are there points in the code the reviewer needs to double check?

The TestEnv changes are needed to reset the branch refs if we're reusing a git directory locally - otherwise, there might not be conflicts!

Why was this MR needed?

It's a bug in a new feature!

Does this MR meet the acceptance criteria?

  • CHANGELOG entry added
  • Tests
    • Added for this feature/bug
    • All builds are passing
  • Conform by the style guides
  • Branch has no merge conflicts with master (if you do - rebase it please)
  • Squashed related commits together

What are the relevant issue numbers?

Closes #21459 (closed).

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: 21459-resolving-merge-conflicts-from-a-forked-repo-through-ui