Using Git's rerere feature to escape recurring conflict hell 77 points by ankitg12 10 hours ago 33 comments story