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

Leandro Gabales August 6, 2014
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

1 vote
Answer accepted
Seth
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.
August 6, 2014

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

Leandro Gabales August 6, 2014

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
TAGS
AUG Leaders

Atlassian Community Events