0x20


A blog about mobile, maker, and embedded development.


Tag: git


  1. Hard Merge Conflict Resolution in Git

    You do a git merge foo and then sigh as you realize there’s a merge conflict in a file you know nothing about. You certainly don’t remember modifying it. You just want to take whatever changes are coming over from the other branch but you don&…

    git