Why can't I merge when there are uncommitted outstanding changes?

Gabor Grothendieck ggrothendieck at gmail.com
Thu Apr 22 09:43:53 CDT 2010


This is not a direct answer to your question but you might want to look at:
http://www.selenic.com/pipermail/mercurial/2009-February/024162.html

On Thu, Apr 22, 2010 at 10:37 AM, Aardwolf <toiletpot at gmail.com> wrote:
>
> I have some files I don't want to commit. I need to to a merge simply to be
> able to push. But it can't merge, because it says "abort: outstanding
> uncommitted changes (use 'hg status' to list changes)".
>
> My uncommitted files have NOTHING to do with the merge, it are different
> files.
>
> Why can't I  just merge?
>
> This is really frustrating for me. Whenever I want to push my changes to the
> "central" repository here, I have problems like this. I just want to have my
> pushed files to be added linearly to the changes on the central repository.
> The files I changed are usually different ones than other changes on the
> central repository.
>
> I don't understand why I need to go through such complex problems everytime
> I just want to push my changes and at the same time keep a few uncommitted
> changes.
>
> What am I doing wrong that hg is so frustrating to me while everyone else
> seems to love it?
> --
> View this message in context: http://old.nabble.com/Why-can%27t-I-merge-when-there-are-uncommitted-outstanding-changes--tp28329783p28329783.html
> Sent from the Mercurial mailing list archive at Nabble.com.
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>


More information about the Mercurial mailing list