Reapply previously resolved merge conflicts
I wish I'd known about this earlier:
http://git-scm.com/2010/03/08/rerere.html
Could save a lot of time when working with feature/topic branches.
Written by Adam Taylor
Related protips
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Git
Authors
Related Tags
#git
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#