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. -- Regards, Nagaraj -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
