Get the error message of a merge conflict of a pull request?

I have a pull request that fails merging.

 

Is it possible to get the error messages of the underlying merge? (With Audit, from log files or anything else)

1 answer

1 accepted

Hi Andreas!

You can enable Stash debug logging to see extra debug info, including the actual commands being invoked on the underlying repository. That said, while conflicts are a natural part of git workflow, you shouldn't be seeing an error message when they occur. I'd advise creating a support request at https://support.atlassian.com and we can help you out. If you can isolate the error in the debug log first it'll be a big help to us diagnosing your problem.

cheers,

Tim

Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

706 views 0 4
Read article

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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot