Stash when you have branching configured and auto-merge enabled; if there is a merge conflict it creates a new merge conflict pull request with the name 'Automatic merge failure' Any new auto-merge failures get tacked on to this pull request. Also there isn't a way to get in and add anything to resolve the merge conflicts. Following the guide that stash provides when restrictions are on branches like 'prevent changes w/o pull request' cannot be done.
This is probably more of an RFE back to Atlassian but it should be noted as more teams try to move fast, these features are not quite fleshed out in the version we are using.
- is related to
-
BSERV-4678 Semi-automatic cascading merges via pull requests
- Gathering Interest
-
- Gathering Interest
-
- Gathering Interest
-
- Gathering Interest