0

This post is inspired by https://blogs.msdn.microsoft.com/oldnewthing/20180316-00/?p=98255, specifically by the part where the patch branch needs to be merged to the feature branch "as ours".

The VSTS web interface does not seem to provide any dials here, all it has to say is: enter image description here

But maybe it is still possible? Is there a configuration option that allows it or maybe it is possible through REST API?

mark
  • 59,016
  • 79
  • 296
  • 580

1 Answers1

0

Tested with the Pull Request Merge Conflict Extension, it works for me.

Another workaround is resolving the conflicts with Visual Studio (See Resolve merge conflicts) or Resolve Command locally first, then Pull Request to merge.

Another thread for your reference : How to resolve merge conflict in pull request in VSTS?

Andy Li-MSFT
  • 28,712
  • 2
  • 33
  • 55