error during Merge with local - Mercurial says =abort: outstanding uncommitted changes
most likely one of the files is not being updated on one of the sides — either stop tracking it or commit the change in it
make a backup copy of all the files you need, before running the command
hg update --clean -r <branchname>
You have uncommitted local changes, so Mercurial complains about it. If you decide to update to a different changeset, Mercurial will try to "merge" your local uncommitted changes with what was done between the parent working folder and the changeset you want to update to. A merge cannot be performed with uncommitted changes, because during the merge process files will be modified, leaving them uncommitted.
So ... do these files need to be committed?
If yes, then you should do that, then you'll be able to update and/or merge
Perhaps, in the confusion, you tried to do something else that updated some files and left you in an intermediate state. In this case you can quickly revert the changes and resolve the problem by running the following commands instead (losing your changes):
hg update --clean
hg merge
hg commit -m "Merge"
You have uncommitted local changes, so Mercurial complains about it. If you decide to update to a different changeset, Mercurial will try to "merge" your local uncommitted changes with what was done between the parent working folder and the changeset you want to update to. A merge cannot be performed with uncommitted changes, because during the merge process files will be modified, leaving them uncommitted.
So ... do these files need to be committed?
If yes, then you should do that, then you'll be able to update and/or merge
Perhaps, in the confusion, you tried to do something else that updated some files and left you in an intermediate state. In this case you can quickly revert the changes and resolve the problem by running the following commands instead (losing your changes):