Fix conflicts only once with Git rerere | Heykuki News