git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2f93541)
Documentation: document pitfalls with 3-way merge
authorbrian m. carlson <redacted>
Sun, 8 Dec 2013 20:40:27 +0000 (20:40 +0000)
committerJunio C Hamano <redacted>
Mon, 9 Dec 2013 21:42:40 +0000 (13:42 -0800)
commitc5665000327388832fa8be0b3bf17669f672481b
tree74d9679a67a1fa97228c822be2bb5a82f099368dtree | snapshot
parent2f93541d88fadd1ff5307d81c2c8921ee3eea058commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/merge-strategies.txt diff | blob | history
git clone https://git.99rst.org/PROJECT