Created
May 9, 2014 10:53
-
-
Save gregoryyoung/ad9df1944004a16e2039 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I ususally use
git checkout --ours README.txtgit checkout --theirs README.txt