[RFC/PATCH 0/2] Explain newbies the "commit before pull" flow

A colleague of mine asked me "why do I need to commit before I can pull", and I was about to send a link to the user manual, when I noticed I couldn't find any explanation about that there.

This little patch serie propose a few more sentence in the user manual, and a little more verbose error message for those who don't read the docs.

I'm not sure the wording is the best we can do. Native-speakers and Git gurus are welcome to improve it ;-).

Matthieu Moy (2):
  merge-recursive: point the user to commit when file would be
    overwritten.
  user-manual: Document that "git merge" doesn't like uncommited
    changes.

 Documentation/user-manual.txt |   14 +++++++++++---
 merge-recursive.c             |    6 ++++--
 2 files changed, 15 insertions(+), 5 deletions(-)