#Managing git conflicts (with Vim).html

        -git will place a ĐĐconflict markerĐĐ into a conflicting file:
            {
                <<<<<<< 
                    
                =======
                    
                >>>>>>> 
            }
        {// make sure to set the following in your .gitconfig:
            [merge]
                tool = vimdiff
        }
        { // invocation / how to read
            $ git mergetool
            +-------+----------+--------+
            |       |          |        |
            | local | previous | remote |
            |       |          |        |
            +-------+----------+--------+
            |                           |
            |        resolution         |
            |                           |
            +---------------------------+
        }
        >the top 3 sections serve as cheatsheets
        >in the bottom, "resolution" area, delete either sections between the guards ("[<>=]+")
          or mix (perhaps append) their contents to the desired effect
        >":qa" after all Đconflict markersĐ are done with; the next conflict will auto open