sublime merge is pretty great, but having a working familiarity with the underlying tool is invaluable when shit inevitably goes sideways while collaborating
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments