问题
I did a fresh checkout of my mercurial project and updated to the tip. I am trying to merge with another branch, but get the error abort uncommitted changes.
> hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "f9e1acf1f459: <commit message>"
1 other heads for branch "<branch>"
> hg merge
abort: uncommitted changes
(use 'hg status' to list changes)
> hg status
> hg status -i
> hg status -u
> hg summary
parent: 7008:f9e1acf1f459 tip
<message for last commit>
branch: <branch>
commit: (clean)
update: 26 new changesets, 2 branch heads (merge)
>hg version
Mercurial Distributed SCM (version 4.9.1)
(see https://mercurial-scm.org for more information)
Copyright (C) 2005-2019 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
I have tried using an older version of mercurial (4.7.1), with the same results.
How do I resolve this?
来源：https://stackoverflow.com/questions/55980310/how-do-you-resolve-the-error-abort-uncommitted-changes-when-trying-to-hg-merg