What is the fastest way to teach a remote team proper Git merge conflict resolution steps using command line tools instead of expensive GUI clients?