Just getting started with git and GitHub. I am mostly working on my local copy (only master branch for now), pushing to origin occasionally. But today I had bunch of local commits (not pushed) and I updated README.md on the GitHub web site resulting in two different versions.
I figured out
git diff master origin/master
I could see new files added and README with all deletions … I was hoping to do something like
git merge origin/master/README.md
Is this possible?
On a related note:
What is the difference between “git diff master origin/master” and “git diff origin/master master”? They looked orthogonal to each other … deletions became additions and vice versa.
At any rate I ended up coping REDAME additions from web, doing
git push --force
git fetch && git merge origin/master
It worked but it was awkward …