Merging abort: outstanding uncommitted changes (use 'hg status' to list changes)

[Andreas]

Hi,

I am new to mercurial and source tree (on mac) and encountered a problem when merging. Following error message appears:

"Errors During Merge

abort: outstanding uncommitted changes
(use 'hg status' to list changes)"

There are uncommited modified and untracked files.

A developer who uses tortoise for windows told me that it should work although there are uncommited changes.

What do I need to do here?

Thanks,
Andy

[stevestreeting · Accepted solution]

It's possible that Tortoise just Shelves all your uncommitted changes automatically when you try to do this. Personally I think that's a bad idea, because you may have just forgotten to commit.

You should either commit or Shelve your changes before merging, your choice.