gistfile1.txt

greg@orc:~/src/EventStore.UI$ git reset --hard
HEAD is now at 00e2772 fixing issue with readme for master branch
greg@orc:~/src/EventStore.UI$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

nothing to commit, working directory clean
greg@orc:~/src/EventStore.UI$ git pull --rebase origin dev
From github.com:EventStore/EventStore.UI
 * branch            dev        -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: fixing issue with readme for master branch
Using index info to reconstruct a base tree...
M	README.md
Falling back to patching base and 3-way merge...
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md

I ususally use git checkout --ours README.txt

git checkout --theirs README.txt