Home › Resources › Vocation & Profession › Git Merge Conflicts – Note to Self

Git Merge Conflicts – Note to Self

Posted on by Ofazomi!

<<<<<<< HEAD
code from branch you are on
=======
conflicting code from branch you are pulling/merging in
>>>>>>> 66f9_long_id_code_goes_here_536299efa982fa

About

A typographic, designological, visulicious extravaganza!

Posted in Vocation & Profession, Web