How to resolve merge conflict in pull request in VSTS?

by

Update

Microsoft just added browser based merges. This may get you out of a pickle for small conflicts.

And offers improved visualizations of the different scenarios as of Sprint 150.

For more complex situations:

You have two options to resolve the conflict, reverse-integrate the changes from the target branch (which creates additional merge commits), or rebase on the target branch (which leaves your history nice and clean).

Merge from target to current branch prior to completing the PR.

You need to clone the repo locally, perform a merge from the target branch to your branch and push those changes up to the repository. VSTS will detect the changes and update the pull request.

            -------o3              PR
           /
---------o1-o2                     target

Thus merge target (o2) to PR:

            -------o3-o4           PR
           /          /
---------o1----------o2            target

Then complete the PR

            -------o3-o4           PR
           /          / \
---------o1----------o2--o5        target

Rebase the PR branch to include the latest changes on target

Alternatively, you can clone the repo locally, rebase the PR branch on the latest version of the target branch, solve all issues from the rebase and force-push the changes back to the PR branch. VSTS will detect the changes and update the pull request.

            -------o3              PR
           /
---------o1-o2                     target

Thus rebase o3 onto o2:

              -------o3            PR
             /
---------o1-o2                     target

Then complete the PR (with Fast-forward merge in the case below):

---------o1-o2-o3                  target

More Related Contents:

  1. How do I resolve merge conflicts in a Git repository?
  2. How to do a GitHub pull request
  3. Git merge left HEAD marks in my files
  4. Preferred Github workflow for updating a pull request after code review
  5. Triggering Azure DevOps builds based on changes to sub folders
  6. Resolving a Git conflict with binary files
  7. Why does git say “Pull is not possible because you have unmerged files”?
  8. How can I check out a GitHub pull request with git?
  9. Can you issue pull requests from the command line on GitHub?
  10. How to send pull request on Git
  11. How can I fetch an unmerged pull request for a branch I don’t own?
  12. Git failed with a > fatal error. could not read Username for
  13. GitHub clone from pull request?
  14. Visual Studio 2017 – Git failed with a fatal error
  15. Checkout part of a branch in Azure DevOps Pipelines (GetSources)
  16. How to apply unmerged upstream pull requests from other forks into my fork?
  17. Send a pull request on GitHub for only latest commit
  18. Fatal: Could not read password for ‘https://[email protected]’: terminal prompts disabled
  19. How do I fix a merge conflict due to removal of a file in a branch?
  20. Sharing rerere cache
  21. Unable to authenticate with Git Bash to Visual Studio Team Services
  22. Squash all my commits into one for GitHub pull request [duplicate]
  23. How can I push my existing Git repository to Team Foundation Service
  24. Merge pull request to a different branch than default, in Github
  25. Semi linear merge
  26. Evil merges in git?
  27. What’s the -practical- difference between a Bare and non-Bare repository?
  28. Can I make fast forwarding be off by default in git?
  29. Splitting a set of files within a git repo into their own repository, preserving relevant history [duplicate]
  30. Git pull deleted uncommitted changes

Leave a Comment