┏━╸┏━┓┏┓╻┏━╸╻ ╻┏━╸╺┳╸┏━┓ ┃ ┃ ┃┃┗┫┣╸ ┃ ┃┃ ┃ ┗━┓ ┗━╸┗━┛╹ ╹╹ ┗━╸╹┗━╸ ╹ ┗━┛ ┌────────────────────────┐ ┌────────────────────────┐ │ #include │ │ int main() { │ │ <<<<<<< HEAD │ │ int a = 5; │ │ #include │ │ <<<<<<< HEAD │ │ ||||||| 9275968 │ │ int b = 4; │ │ ======= │ │ ||||||| 9275968 │ │ #include │ │ 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