"unresolved merge conflicts" due to files created by SourceTree/mercurial

hg commit -y --logfile C:\Users\LG\AppData\Local\Temp\rdhcyxzm.h2e
abort: unresolved merge conflicts (see hg help resolve)

Completed with errors, see above.

When I attempt to commit, this comes up. The name of the file is always different and it always has a different file suffix. I cannot push because of this, and it's stopping me from updating my repository on Bitbucket.

How does one go about fixing this?

EDIT: just adding that I was able to successfully commit/push before this started happening

1 answer

1 accepted

Accepted Answer
1 vote

The error message you posted is NOT telling you that rdhcyxzm.h2e is causing or part of a merge conflict, it is just a log file. You should check your SourceTree UI for files that have a yellow warning symbol beside them, and resolve merge conflicts in those files.

For more information on what "unresolved merge conflicts" means, read:

http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts

The log file only contained the commit message.

In any case, I resolved the stuff marked with yellow "!" warning symbols and the problem was solved.

Thank you for your help.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

989 views 2 3
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