Conflict handling

[Vincent LADEUIL]

>>>>> "Erik" == Erik Bågfors <zindar at gmail.com> writes:

    >> As far as there is: - a easy way to ask bzr what files are
    >> in conflict,

    Erik> bzr status or bzr conflicts

Ok. Thanks.

    >> - a simple way to handle the conflicts (automatic will be
    >> even better),

    Erik> Use meld or something if you want it automatic (well,
    Erik> as automatic as it gets).

I knew I was unclear :-) 

I  already use emacs  and its  ediff/emerge facilities,  but meld
looks good :-)

Thanks   for   the   pointer    (google   quickly   led   me   to
http://meld.sourceforge.net/).

I was not talking about  handling the *content* of the conflicts,
but about was  is left when you have decided  which part you want
to  keep:  delete conflict  markers,  remove  work files,  inform
version control tool (if needed :).

    >> - no cleaning to do afterwards.

    Erik> bzr resolve will clean for you.

Ok.

    >> I'll be happy :)

    Erik> Be happy :)

I am and surely will even be more in the future :)

  Vincent