| commit | c5665000327388832fa8be0b3bf17669f672481b | |
| author | brian m. carlson <sandals@crustytoothpaste.net> | |
| Sun, 8 Dec 2013 20:40:27 +0000 (8 20:40 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Dec 2013 21:42:40 +0000 (9 13:42 -0800) | ||
| tree | 74d9679a67a1fa97228c822be2bb5a82f099368d | treesnapshot (tar.gz zip) |
| parent | 2f93541d88fadd1ff5307d81c2c8921ee3eea058 | commitdiff |
Documentation: document pitfalls with 3-way merge
Oftentimes people will make the same change in two branches, revert the change
in one branch, and then be surprised when a merge reinstitutes that change when
the branches are merged. Add an explanatory paragraph that explains that this
occurs and the reason why, so people are not surprised.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Oftentimes people will make the same change in two branches, revert the change
in one branch, and then be surprised when a merge reinstitutes that change when
the branches are merged. Add an explanatory paragraph that explains that this
occurs and the reason why, so people are not surprised.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-strategies.txt | diffblobblamehistory |