“Understanding Git Conflict Markers”Reading the markers left by a merge or rebaseOctober 30, 2015Now those rebase conflict markers make sense.