Re: [WIP/PATCH 0/4] Re: Making error messages stand out

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Aug 11, 2010, 09:39 UTC
Message-ID: <vpqhbj11o9d.fsf@bauges.imag.fr>
In-Reply-To: <AANLkTi=cNUTG-DGZNpwrag9Wz2-JoQQamiayKVNA5wbn@mail.gmail.com>

Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:

> Even better, make it available for some time with, say "git hints".
> After doing lots of things to resolve conflicts, I simply forget what
> it hinted me.

Actually, I don't think we should add a new command for that, but add something to "git status", like

$ git status # On branch master # rebase in progress (use "git rebase --continue" to proceed) # ...

Same would apply to conflicting merges. It's very common for beginners (especially when they come from SVN) to start a merge, mis-read the message telling you to commit once you fixed the conflicts, fix conflicts, and continue hacking. A message in "git status" when .git/MERGE_HEAD exists would help a bit, like (depending on whether the index still has conflicts):

# merge in progress (fix conflicts below and commit)

# merge in progress (use "git commit" to proceed)

If one adds an option to make it all-caps, red, and blinking, then I'll activate it for my students ;-).

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