From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Tue, 18 Jun 2013 08:49:28 GMT
Subject: Re: [PATCH] Documentation/git-merge.txt: weaken warning about uncommited changes
Message-ID: <CALkWK0=USVa2htHSTyj4C7FrKEko-e_UGAnu-3UNvx_ue1vwig@mail.gmail.com>
In-Reply-To: <1371544975-18703-1-git-send-email-Matthieu.Moy@imag.fr>

Matthieu Moy wrote:
> 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].  We should update the documentation to point to it: I
do not think "non-trivial" is much of an improvement.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/221069/focus=221366