Cacher is the code snippet organizer for pro developers

#So you decide to take a look at the changes:

git mergetool

#Oh me, oh my, upstream changed some things, but just to use my changes...no...their changes...

git checkout --ours filename.c 
git checkout --theirs filename.c git add filename.c git 
commit -m "using theirs"