Search code examples
azureazure-devopsgit-mergepull-requestgit-merge-conflict

azure-devops Merge Issue for Test Branch

we have azure devops repo setup with Master > TEST > Development

for last sprint we merged changes from Development to TEST and had merge conflicts one of the developer created local TEST branch and Merged Development changes to resolve changes and committed changes using local TEST branch

After that pullrequest is created from local TEST branch to Remote TEST branch & completed pull request

Now if we create pullrequest from Development to remote TEST it shows remote TEST is having latest changes

Any help will be appreciated and what all options available to resolve this issue

Flow

Thank you Dyanesh

Solution

  • Here is my reproduction of your question. Is the process you want to express as shown below?

    First clone the remote repo to the local and merge from the local Development branch into the local Test branch. Then push the local Test branch to the remote Test branch.

    enter image description here enter image description here

    Then when you create a pull request from the Development branch to the Test branch in azure devops, you get the following prompt.

    enter image description here

    If so, this is normal, because you have merged the changes from the development branch to the local Test branch locally, and then pushed the changes from the local Test branch to the remote Test branch. At this point, the remote development branch has been synchronized with the Test branch, so naturally there are no changes that need to be merged.

    If I misunderstood the issue, please point it out. It would be much easier for people to understand and reply if you could attach screenshots of detailed steps.