| commit | c8c562a238071843c64ea0f3a2c85481606da379 | |
| author | Clemens Buchacher <drizzd@aon.at> | |
| Mon, 1 Jun 2009 09:20:56 +0000 (1 11:20 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jun 2009 02:42:17 +0000 (1 19:42 -0700) | ||
| tree | c6a892cba320d30eb71b10c96a11c3d77ff731a6 | treesnapshot (tar.gz zip) |
| parent | 6a01554e6350123c78de805d820e90f1c56e5fdc | commitdiff |
refuse to merge during a merge
The following is an easy mistake to make for users coming from version
control systems with an "update and commit"-style workflow.
1. git pull
2. resolve conflicts
3. git pull
Step 3 overrides MERGE_HEAD, starting a new merge with dirty index.
IOW, probably not what the user intended. Instead, refuse to merge
again if a merge is in progress.
Reported-by: Dave Olszewski <cxreg@pobox.com>
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The following is an easy mistake to make for users coming from version
control systems with an "update and commit"-style workflow.
1. git pull
2. resolve conflicts
3. git pull
Step 3 overrides MERGE_HEAD, starting a new merge with dirty index.
IOW, probably not what the user intended. Instead, refuse to merge
again if a merge is in progress.
Reported-by: Dave Olszewski <cxreg@pobox.com>
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-merge.c | diffblobblamehistory | |
| t/t3030-merge-recursive.sh | diffblobblamehistory |