Doing a big git pull frequently leads to trouble. The rerere command might be particularly useful for recurring conflicts. http://notes.envato.com/developers/

Doing a big git pull frequently leads to trouble. The rerere command might be particularly useful for recurring conflicts. http://notes.envato.com/developers/rebasing-merge-commits-in-git/ http://notes.envato.com/developers/rebasing-merge-commits-in... https://news.ycombinator.com/item?id=2874968 https://news.ycombinator.com/item?id=2874968 http://git-scm.com/2010/03/08/rerere.html http://git-scm.com/2010/03/08/rerere.html