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.
22 lines
1.4 KiB
22 lines
1.4 KiB
|
|
|
|
|
|
┏━╸┏━┓┏┓╻┏━╸╻ ╻┏━╸╺┳╸┏━┓
|
|
┃ ┃ ┃┃┗┫┣╸ ┃ ┃┃ ┃ ┗━┓
|
|
┗━╸┗━┛╹ ╹╹ ┗━╸╹┗━╸ ╹ ┗━┛
|
|
|
|
┌────────────────────────┐ ┌────────────────────────┐
|
|
│ #include <algorithms> │ │ int main() { │
|
|
│ <<<<<<< HEAD │ │ int a = 5; │
|
|
│ #include <sstream> │ │ <<<<<<< HEAD │
|
|
│ ||||||| 9275968 │ │ int b = 4; │
|
|
│ ======= │ │ ||||||| 9275968 │
|
|
│ #include <string> │ │ int b = 8; │
|
|
│>>>>>>> new_feature │ │ ======= │
|
|
└────────────────────────┘ │ int b = 9; │
|
|
│ >>>>>>> new_feature │
|
|
└────────────────────────┘
|
|
- Conflict markers appear in the file itself
|
|
- Simplest way to handle:
|
|
-> directly modify the file
|
|
- Git difftool for visual conflict resolving
|