how remerge works and when to use it?

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> I'm still wonder "when I need/should/could use remerge"? What's benefits?
> 
> Does it:
> 
> 1) remerge intended to use with many many conflicts in the file(s) in the hope it will reduce number
> of conflicts?

Yes.

> 4) or only when user has enough free time to play with remerge instead of actually trying to solve
> the conflicts by hands?

remerge isn't meant to be a toy-- it's meant to save time, not waste
time.  If you only have a few conflicts, and they make sense, then you
probably shouldn't use remerge.

> Maybe the author(s) of this command can provide some historical info about why for it was created?
> What was motivation?

I merge.  I get conflicts.  I want to try again with a different
algorithm, because I think it might handle the situation better.  It was
also useful for comparing the outcomes of different merge algorithms
while developing them.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkp5xpoACgkQ0F+nu1YWqI0OGwCfZPI95SiQZa+SJTN882P4neO8
3yoAoIEEyiAZHoAMpP0LaeDpeOSIAEXU
=Mhgx
-----END PGP SIGNATURE-----