Pull Request restriction in Stash 3.10

Jon Krengel June 16, 2015

Stash 3.10 introduced a branch permission restriction to require a pull request.  What happens when you have a merge conflict in the pull request?  Does is allow pushes that resolve a pull request?

1 answer

0 votes
Tim Crall
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
June 16, 2015

The conflict should be resolved in the feature branch before reissuing the pull request.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events