CODEWITHSUNDEEP
gitazure-devopsgit-workflow
ab_732
ab_732

Reputation: 3897

Git workflow issue on Azure DevOps

I am using the following workflow with Git on Azure DevOps.

I have two branches, main and develop. When it's time for a release, I create a release branch rb from develop and open a pull request into the main branch. When ready, I merge then with no fast forward. After the release, I merge main into develop with the same strategy, no fast forward.

We associate the work items we have been worked on in every commit. So when I open the Pull Request rb > main I can see the full list of work items involved.

The weird thing is, on the first release all went fine. On the following ones, when I open the Pull Request rb > main the UI in Azure DevOps shows me as I am trying to merge not just the Work Items of the current release branch, but also those of the previous releases!

The problem goes away if I rebase develop over main after I merge main > develop after the release, but I don't think that is the right thing to do. I think I misinterpreting the correct way to manage the workflow with Azure Devops. Can anyone explain me what am I doing wrong?

Thank you.

Upvotes: 1

Views: 199

Answers (0)

Related Questions