DEV Community

Conflict Resolution: Git Merge practice

Dan on April 02, 2019

This assumes you have some basic knowledge of git and the command line (I use bash). For reference I’ve included a few of the commands used in the ...
Collapse
 
thomasrayner profile image
Thomas Rayner

This is fantastic. Thanks for the write up.

Collapse
 
cookrdan profile image
Dan

Thank you!