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