Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Stash won't display conflicted files in "changed files"-list

Hi.

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).

Any suggestions/ideas/solutions?

Regards, Ingo

2 answers

Hi Ingo,

This might not be the issue, but you might want to take a look at the following:

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

Otherwise, I suggest raising a support ticket so we can look at your logs/configuration a little more closely.

Cheers,

Charles

Charles,

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...

Regards,

Ingo

Yeah, I might suggest opening a ticket. It's most likely something environmental, but it's impossible to say without knowing more.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Marketplace Apps & Integrations

Learn how to request and manage app requests in the Marketplace

G’day everyone! Super exciting news coming from the Marketplace. We have now fully rolled out the ability for end-users to submit app requests to admins directly from within the product! No longer ...

43 views 1 5
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you