From: Jakub Narebski <jnareb@gmail.com>
Date: Sun, 25 Sep 2011 13:24:00 GMT
Subject: Re: More Beginning Git Questions
Message-ID: <m3wrcwpxh7.fsf@localhost.localdomain>
In-Reply-To: <nbd7plmz30x2.mafpxaq9xl9r.dlg@40tude.net>

tactical <a5158017@nepwk.com> writes:
> Jakub Narebski wrote:

> > Anyway merging with local changes is an easy way to f**k up your
> > changes in unrecoverable way, IMVHO...
> 
> Mercurial backs everything up before doing this merge, so if I do lose my
> local changes, I can start over with this:
> 
>     hg resolve --unmark --all
>     hg resolve --all

Well, that's the advantage of database-like transaction based atomic
operations.

OTOH reflog allows to back out not only last operation...

-- 
Jakub Narębski