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?
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.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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