@@ -6,22 +6,23 @@ a 3-way merge view to resolve the conflicts.
6
6
7
7
## Benefits
8
8
9
- By default git will add text conflict markers in the file with conflict, but
10
- that is only giving context from ** two** versions, having a full ** 3-way** context
11
- is vastly superior (as well as being graphical is much easier to easier to
12
- review).
9
+ By default git will just add text conflict markers in the file with conflict,
10
+ but that is only giving context from ** two** versions, having a full ** 3-way**
11
+ context is vastly superior (as well as being graphical is much easier to easier
12
+ to review).
13
13
14
14
And by using KDiff3 you will able to both review (and override) all the
15
15
automatically resolved conflicts. Being able to see which versions that were
16
16
selected automatically can often be a big help in determing how to resolve
17
17
conflicts that were not automatically resolved.
18
18
19
- # Usage/example
19
+ # Usage
20
20
21
- ## Create repository with a conflict
21
+ ## Example repository with a conflict
22
22
23
- Modifying ` .gitignore ` on two branches, same change but one of them
24
- also adds a comment.
23
+ This is an example where the file ` .gitignore ` is modified on two branches,
24
+ which results in a conflict when rebasing. The changes are basically the same
25
+ but one of them also adds a comment.
25
26
26
27
``` bash
27
28
$ git init
@@ -77,7 +78,7 @@ KDiff3 to resolve this automatically:
77
78
![ KDiff3 screenshot, manual diff alignmet] ( doc/images/kdiff3_manual_diffalignment.png )
78
79
79
80
Saving and quiting KDiff3, the script asks if you are satisfied with the result
80
- and want to add the file:
81
+ and want to add the file to the index :
81
82
82
83
![ Running script screenshot] ( doc/images/run_script_002.png )
83
84
0 commit comments