Re: [PATCH] Documentation/git-merge.txt: weaken warning about uncommited changes

Ramkumar Ramachandra [off-list ref] writes:

Matthieu Moy wrote:

quoted

Weaken the warning by discouraging only merge with /non-trivial/
uncommited changes.

I don't think documenting all the failure cases in the doc would be a
good idea, so I've left the "in some cases" part.

It's already documented in the pre-merge checks section, as Jonathan
pointed out [1]. 

I had missed this one. But that's not the only case, you may also have
problems with renames. The complete list would be really long to have
here, and won't bring much to the user.

We should update the documentation to point to it: I do not think
"non-trivial" is much of an improvement.

Actually, I think it essentially says it all. If your changes are
important enough to deserve a real backup, you should stash or commit.
If you're ready to take the risk of losing it (the risk is small, but
does exist), it's OK to run "git merge" blindly.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/