You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
18 lines
494 B
18 lines
494 B
|
|
|
|
|
|
┏━╸┏━┓┏┓╻┏━╸╻ ╻┏━╸╺┳╸┏━┓
|
|
┃ ┃ ┃┃┗┫┣╸ ┃ ┃┃ ┃ ┗━┓
|
|
┗━╸┗━┛╹ ╹╹ ┗━╸╹┗━╸ ╹ ┗━┛
|
|
|
|
|
|
|
|
Git tracks (per hunk-) conflicts over three files:
|
|
- base/common
|
|
- ours
|
|
- theirs
|
|
|
|
- $ git config --global merge.conflictstyle diff3
|
|
- Often helpful to have common state
|
|
|
|
|