Cannot update "outstanding uncommitted merges" but there are
none such merges
bos at serpentine.com
Fri Sep 16 09:43:25 CDT 2005
On Fri, 2005-09-16 at 16:28 +0200, Stephane Bortzmeyer wrote:
> -C was necessary but now it works. There is now only one head. Now, I
> will try to understand what happened.
This can happen if you pulled changes into your repository and forgot to
do an update afterwards. This leaves the working directory at whatever
revision you were already at.
More information about the Mercurial