[MERGE] Avoid losing data when converting a local branch to a lightweight checkout

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Aaron Bentley wrote:
> I don't think the error message is quite clear enough about what is
> wrong so
> that the user knows what they can do to make things succeed.

There are at least four things they can do to make it succeed.
1. push [--overwrite] the local branch to the target.
2. pull [--overwrite] the target to the local branch.
3. merge the local branch from the target, commit and push.
4. update the local checkout from the target branch (and maybe commit).

Trying to describe what to do succinctly seemed hopeless.  If you have
any suggestions, I'd love to hear them.

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

iD8DBQFH/QpH0F+nu1YWqI0RAlUqAJ9poUzrDkOmy0olTu6hwMoroVoZlgCeOSJK
b284ooeq+X371ZAcCiUAn9U=
=W3c6
-----END PGP SIGNATURE-----