Pull Requests can't be merged from a web browser

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.

1 answer

Hi Bobby,

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.

https://confluence.atlassian.com/display/STASHKB/Pull+request+merges+can+fail+when+Stash+is+hosted+on+Windows

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.

https://support.atlassian.com

Cheers,

Charles

Hi Charles,

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.

Thanks!

Bobby

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

30,910 views 26 12
Join discussion

Atlassian User Groups

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!

Find my local user group

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

Groups near you