gist.github.com2 months agoUsing Git's rerere feature to escape recurring conflict hellArticle URL: https://gist.github.com/skipcloud/f1033afb4fa5681d69fa63458cc95928 Comments URL: https://news.ycombinator.com/item?id=48353504 Points: 8 # Comments: 0Visit gist.github.comBookmarkAdd to collection