Understanding Git Conflict MarkersgitWill FaughtOctober 30, 20151 minuteNow those rebase conflict markers make sense.