Reacting on Rails

Thoughts on software design, testing, and everything in between.

Tag: git

24 Oct
Tutorials

Resolving Merge Conflicts in Binary Files

by Josh Saint Jacque
No Comments
Merge graphic by Bluetip Design. I had this come up today and thought it might be useful for someone else. Have you gone to run git pull...