Using Git's rerere feature to escape recurring conflict hell | Heykuki News