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

Stephen Rasku mercurial at srasku.net
Thu Apr 22 09:59:03 CDT 2010


On Thu, Apr 22, 2010 at 07:49, Aardwolf <toiletpot at gmail.com> wrote:

>
> I'm sorry, but I tried this shelve extension, and it simply doesn't work
> for
> me.
>

Can you do the following?:

1. clone the repo that needs the merge
2. do merge in clone
3. push merged clone (either to your repository or directly upstream)

Would that work for you?

...Stephen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20100422/4be9636d/attachment.htm>


More information about the Mercurial mailing list