I am only a crack in this castle of glass. Hardly anything else I need to be.
An explanation of a method of resolving merge-conflicts in git.Th...