VirtualTam's bookmarks

1. Fix conflicts only once with git rerere

   2015-06-11
   conflict merge rebase source-code-management/git text/diff

   Permalink

   Original article: http://www.git-attitude.fr/2014/11/04/git-rerere/ Official doc: http://git-scm.com/docs/git-rerere