Ciro Santilli @cirosantilli 37

git config --global merge.conflictstyle diff3

git checkout --conflict=diff3

++<<<<<<< HEAD
 +5
++||||||| parent of 7b0f59d (6)
++3
++=======
+ 6
++>>>>>>> 7b0f59d (6)

++<<<<<<< ours
 +5
++=======
+ 6
++>>>>>>> theirs

* b4ec057 (HEAD, master) 5
* 0b37c1b 4
| * fbfbfe8 (my-feature) 7
| * 7b0f59d 6
|/
* 661cfab 3
* 6d748a9 2
* c5f8a2c 1

git add .
git rebase --continue

++<<<<<<< HEAD
 +11
++||||||| parent of fbfbfe8 (7)
++6
++=======
+ 7
++>>>>>>> fbfbfe8 (7)

* ca7f7ff (HEAD) 6
* b4ec057 (master) 5
* 0b37c1b 4
| * fbfbfe8 (my-feature) 7
| * 7b0f59d 6
|/
* 661cfab 3
* 6d748a9 2
* c5f8a2c 1

* e1aaf20 (HEAD -> my-feature) 7
* ca7f7ff 6
* b4ec057 (master) 5
* 0b37c1b 4
* 661cfab 3
* 6d748a9 2
* c5f8a2c 1

sudo apt install meld
git mergetool --tool meld

sudo apt install kdiff3
git mergetool --tool kdiff3

#!/usr/bin/env bash

set -eux

add() (
  rm -f f
  for i in `seq 10`; do
    printf "before $i\n\n" >> f
  done
  printf "conflict 1 $1\n\n" >> f
  for i in `seq 10`; do
    printf "middle $i\n\n" >> f
  done
  printf "conflict 2 $2\n\n" >> f
  for i in `seq 10`; do
    printf "after $i\n\n" >> f
  done
  git add f
)

rm -rf git-tips-2
mkdir git-tips-2
cd git-tips-2
git init

for i in 1 2 3; do
  add $i $i
  git commit -m $i
done

add 3 4
git commit -m 4

add 5 4
git commit -m 5

git checkout HEAD~2
git checkout -b my-feature

add 3 6
git commit -m 6

add 7 6
git commit -m 7

5 master
|
4 7 my-feature HEAD
| |
3 6
|/
2
|
1

git rebase

7 my-feature HEAD
|
6
|
5 master
|
4
|
3
|
2
|
1

7 my-feature HEAD
|
6
|
5 master
|
4
|
3
|
2
|
1

git rebase -i HEAD~2

7 my-feature HEAD
|
6v2
|
5 master
|
4
|
3
|
2
|
1

7 my-feature HEAD
|
6
|
5 master
|
4
|
3
|
2
|
1

git rebase -i HEAD~2

67 my-feature HEAD
|
5 master
|
4
|
3
|
2
|
1