0

When trying to complete a pull request (PR) that merges our develop branch into master in Azure DevOps (using rebase and fast-forward), a merge conflict occurs if some commits already exist on master. This happens when commits have been pushed to both develop and master before the merge attempt (for example, when a hotfix is pushed directly to master to address a production issue).

Is there a way to configure Azure DevOps to automatically skip commits that are already present on master during the merge process?

Alternatively, would it be better to adopt a workflow where we build and publish from release branches, allowing hotfixes to be merged into the release branch instead of master, avoiding the need to cherry-pick commits to master?

Note: Force-pushing to the master branch is not an option due to compliance restrictions. Additionally, I’m part of a small backend team that frequently releases new production builds.

1 Answer 1

0

You should made change on release branch. Master branch should not be edited directly. Then you will not have conflict and cleaner flow.

Maybe creating a hot-fix branch will help with tracking hot-fixes.

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Not the answer you're looking for? Browse other questions tagged or ask your own question.