nub # read code git revert # watch as git does all the work git mergetool # fix a couple of conflicts git gui # commit