Is there any way to detect a merge conflict when using Development Pipelines with Work Items method?
Is there any way to detect a merge conflict when using Development Pipelines with Work Items method?
Explaining the limitations of Work Items when it comes conflict resolution.
Written by Dustin Levi
Updated over a week ago
With work items specifically, the simple answer is no. However, through doing a normal deployment from your sandbox to Git, you are able to detect those merge conflicts.
And if you’re working in the same sandbox. Git catches those conflicts through pull requests.