┏━╸┏━┓┏┓╻┏━╸╻ ╻┏━╸╺┳╸┏━┓
┃ ┃ ┃┃┗┫┣╸ ┃ ┃┃ ┃ ┗━┓
┗━╸┗━┛╹ ╹╹ ┗━╸╹┗━╸ ╹ ┗━┛
Git tracks (per hunk-) conflicts over three files:
- base/common
- ours
- theirs
- $ git config --global merge.conflictstyle diff3
- Often helpful to have common state
