Git - Merging release branch into master

[Borat Sagdiyev]

I have a master branch and release branches in my git repository which is hosted on bitbucket. I got a merge conflict when I merged release branch r1 into master. The merge conflict was only due to a read me text file.

I fixed the conflict and got an error when I pushed the merged code - "branch can only be modified through pull requests". I know this happens because we are not allowed to push directly into master. How do I merge r1 into master in this case ?

Thanks.

[Mikael Sandberg]

You would have to create a pull request in order to merge r1 into master. In Bitbucket, click on Pull requests in the repository and then on Create pull requests and follow the on-screen instructions.