On Mon, Feb 22, 2016 at 05:24:15PM +0530, Nagaraj Mandya wrote: > Hello, > In our GIT repository, all users are restricted from merging to > master without a pull request. This works well and all developers are > raising pull requests and merging. However, if there is a merge > conflict during the merge, we have a problem. > > We follow the instructions provided by Bitbucket and the final step > is to push the merged code to master to the "origin" repository. > However, that steps always fails with the error that pushes can only > be made with pull requests. > > How do we work around this problem? We want all pushes to happen > through merge requests but still allow pull requests with merge > conflicts to get pushed. Thanks. The usual way to solve this is to rebase those commits of the pull requests on the updated master. That allows the one who makes the pull request to solve the issues, and then push the branch again (adding --force-with-lease because you've rewritten history). This should update the pull request, but now it should be able to be merged without conflicts. That way, you are not required to merge locally into master and push that. The merge local option will only work if at least someone has rights to push to master, but that is a bitbucket question, not a git question. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html