Kainoa 
Currently dealing with a long and painful git merge, is there any way to get
git merge to accept ours ("Current Change") if and only if theirs ("Incoming Change") is blank?
Shalien