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.
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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