The difference between update and merge (was: Completely baffled)

[Isaac Jurado]

On Tue, Dec 6, 2011 at 10:52 PM, Dennis Brakhane
<brakhane at googlemail.com> wrote:
>
> $ hg resolve afile --tool internal:local
> or
> $ hg resolve afile
> to redo the merge?

I think I need grammar classes or something.

Please follow these steps:

    1. Execute the command sequence of the previous email.
    2. When merging "afile" choose something DIFFERENT to the sequence
       of k's, or write whatever else.
    3. Remerge using whatever method you mentioned and TRY TO FIND A
       SEQUENCE OF k's

If you cannnot find it, you have lost work.

I'm not blaming mercurial, I'm just warning from a BAD PRACTICE.  I've
lost a lot of work before learning that the proper way is commiting
before and NOT letting "hg update" merge my dirty working copy.

Cheers.

-- 
Isaac Jurado

"The noblest pleasure is the joy of understanding"
Leonardo da Vinci