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

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

Andreas Borkenhagen September 14, 2014

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

1 vote
Answer accepted
TimP
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
September 15, 2014

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 Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events