diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-11-22 23:26:18 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:07:28 -0800 |
| commit | e63ec003b2a0c89f0c1cbc4862dcef7c4a14a785 (patch) | |
| tree | 8d4aa3ed37aab9242f2bf4192c86d2991d6f23f8 /merge-tree.c | |
| parent | merge-recursive: point the user to commit when file would be overwritten. (diff) | |
| download | tgif-e63ec003b2a0c89f0c1cbc4862dcef7c4a14a785.tar.xz | |
user-manual: Document that "git merge" doesn't like uncommited changes.
We explain the user why uncommited changes can be problematic with merge,
and point to "commit" and "stash" for the solution. While talking about
commited Vs uncommited changes, we also make it clear that the result of
a merge is normally commited.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions