You're viewing a single thread.
81
comments
or for people who don't have a week to dedicate to learning utterly deranged nonsense, just use sublime merge and never look back.
sublime merge is pretty great, but having a working familiarity with the underlying tool is invaluable when shit inevitably goes sideways while collaborating
81
comments