tactical <a5158017@xxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html