Merging pull request

[glen_openet]

We're having a problem merging pull requests.

If we review and merge the pull request before any other changes are merged onto the branch then the merge works.

However, if there has been any merge to the branch by the core developers (i.e. directly in Git and not through Stash) between the time the pull request was created and the attempted merge occurs, then we get this error message:

"New changes were pushed to master in UTF/utf while the merge was being performed. Please retry the merge."

This message occurs even though there were no files in conflict due to the merges.

The only solution at this point is to stop people merging, and have the person who submitted the pull request delete it and add a new one pull request, then merge it immediately.

This is obviously starting to annoy our contributors.

Stash version is v2.4.2

[cofarrell]

Hi Glen,

That doesn't sound right. Would you mind raising a support request and attach a support zip (<tt>Administration >> Support >> Atlassian Support Tools >> Support Zip)</tt> so we can go from there? Before you do that if you have time to enable debugging (<tt>Administration > Logging and Profiling</tt>.) reproduce the problem on a test repository, and then create the zip that will make it easier to diagnose.

Cheers,

Charles

[cofarrell]

Hi Glen,

Oh I can see you've already raised a ticket. Just to mentioned this here for other people reading this, there appears to be something wrong with Stash's hooks not firing, which is affecting your pull requests. The behaviour you describe is not expected.

Charles

[Foong]

Solution from the support case: Make sure that all the hooks in STASH_HOME/data/repositories/<id>/hooks are executable

[cofarrell]

https://confluence.atlassian.com/display/STASHKB/Pull+Requests+Not+Reflecting+Changes+Pushed+to+Remote+Branch+After+an+Upgrade