When using pull requests I always get the message:
This pull request can't be merged. You will need to resolve conflicts to be able to merge. More information.
I'll follow the instructions but I never see any conflicts when performing the merge from the command line.
I don't suppose you're on Windows? There is a known issue on Windows where having a deep file path for your STASH_HOME directory will result in fake merge conflicts.
If that's not the case, perhaps have a look in your logs and post any exceptions or messages you might see here. Otherwise, or in any case, feel free raise a support call with your logs attached so we help diagnose your problem further.
Thanks for the tip. We are on Linux - We do have many repos and projects enabled though. I have a support issue logged now and Atlassian folks just mentioned it might have to do with a plugin we have installed. I'll be trying that today and will post my findings.
Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs