diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2013-12-08 20:40:27 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-09 13:42:40 -0800 |
| commit | c5665000327388832fa8be0b3bf17669f672481b (patch) | |
| tree | 74d9679a67a1fa97228c822be2bb5a82f099368d /builtin/merge-ours.c | |
| parent | 2f93541d88fadd1ff5307d81c2c8921ee3eea058 (diff) | |
| download | git-c5665000327388832fa8be0b3bf17669f672481b.tar.gz | |
Documentation: document pitfalls with 3-way mergebc/doc-merge-no-op-revert
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>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions