We've moved our stash (v2.10.1) from a pre-production-server to production - with the effort of loosing the display of which files have merge-conflicts in a pull-request.
On the top right the merge button is greyed-out and the exclamation-mark-tooltip shows "You will need to resolve conflicts to be able to merge" - but none of the files in the "changed files" frame are highlighted (as they were in the testing-environment) neither by selecting the diff we see where the conflicts emerge.
Configurations are identical, the only difference we have been able to discover is a newer git-version (1.7.10 on pre vs. 1.8 on production).
This might not be the issue, but you might want to take a look at the following:
Otherwise, I suggest raising a support ticket so we can look at your logs/configuration a little more closely.
thanks for your response - your idea about the hooks seemed legit due to missing +X-permissions. But adding those did not do the trick.
Is it possible that the diff-conflict-display is processed anytime the diff-page is opened? Then the hooks should not be the trigger, aren't they?
Maybe we really have to open the ticket...
As a Belgian, beer-lover and home brewer, beer is one of my great passions. I love the fact that with just a few ingredients (usually just water, hop and malt) you can create so many different tastes...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot