Friends don't let friends resolve conflicts twice, with #git : http://progit.org/2010/03/08/rerere.html
0
3
2
0
0