Resolving merge conflicts through a pull request

user_3289852 0
Viewed 346

I have two branches, Master which reflects Production, and a current release branch (let's call it Sprint) serving as base branch for all developers for the ongoing release. On both the branches, I have permissions setup that no changes will be pushed directly without a Pull Request.

Now, I need to merge Master into Sprint but when I do that, I've merge conflicts.

How can I resolve those conflicts since I can't push anything directly to Sprint?

pull-request bitbucket version-control git
1 Answers

You can :

On your local repo :

  • create a workbranch from master
  • merge Sprint into workbranch (git merge Sprint)
  • fix the conflicts (they will be the same as the ones in the pull request) and commit the result on workbranch
  • push workbranch to your remote

On bitbucket :

  • open a pull request to merge workbranch into master
user_860720
Related