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

[John Arbash Meinel]

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

Aaron Bentley wrote:
| 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

Branches are out of sync. See "bzr help sync-for-reconfigure" and then add a
help topic with exactly this list.

At least, that would be my suggestion.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIAp+iJdeBCYSNAAMRAhY2AKCmRagCINpVtkPmRk3ItqfRlQF45gCZASzw
DJqgsfc+2sZGhg4dKj08jFc=
=jgwb
-----END PGP SIGNATURE-----