hi
automatic merge failure will create a new pull request, however if you have "Changes without a pull request" you will never be able to push to that branch
remote: ----------------------------------------------------
remote: Branch refs/heads/master can only be modified through pull requests.
remote: Check your branch permissions configuration with the project administrator.
Probably the best in these scenarios is to allow merge these commits
Merge branch 'release/4' of ssh://bitbucket.tekla.com:7999/tsecs/repo
# Conflicts:
# Installer/manifest.xml
