Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Product Q&A
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

Pull Request restriction in Stash 3.10

Jon Krengel
Jon Krengel
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
Get involved
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?

Answer
Watch
Like Be the first to like this
317 views

1 answer

0 votes
Tim Crall1
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.
Get recognized
June 16, 2015

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

Reply

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
TAGS
AUG Leaders

Atlassian Community Events

    See all events