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

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

1 answer

1 accepted

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.

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

273 views 0 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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot