Skip to content

Commit 8afefbb

Browse files
committed
Add note about difference with diffing LOCAL and REMOTE
TODO: re-record the video to also showcase this.
1 parent d5ed746 commit 8afefbb

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,12 @@ Vimdiff is well-suited to two-way diffs:
5151

5252
Git does an admirable job of automatically resolving conflicts. We want to
5353
retain all the work and resolve only the things that Git could not. That work
54-
is reflected in the files containing conflict markers. Rather than editing the
55-
conflict markers directly, it is better to perform a two-way diff on just the
56-
"left" and "right" sides of the conflict markers by splitting them apart.
54+
is reflected in the files containing conflict markers, but it is not reflected
55+
in a two-way diff between LOCAL and REMOTE.
56+
57+
Rather than editing the conflict markers directly, it is better to perform a
58+
two-way diff on just the "left" and "right" sides of the conflict markers by
59+
splitting them apart.
5760

5861
## Installation
5962

0 commit comments

Comments
 (0)