Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Last login: Sat Jul 26 20:54:27 on ttys007
- ~ $ mkdir git-bug
- ~ $ cd git-bug/
- ~/git-bug $ git init
- Initialized empty Git repository in /Users/rich/git-bug/.git/
- ~/git-bug $ echo "test line one" > readme
- ~/git-bug $ git add readme
- ~/git-bug $ git commit -a -m "one"
- Created initial commit 541fc1d: one
- 1 files changed, 1 insertions(+), 0 deletions(-)
- create mode 100644 readme
- ~/git-bug (git::master) $ git checkout -b conflict
- Switched to a new branch "conflict"
- ~/git-bug (git::conflict) $ echo "more text" > readme
- ~/git-bug (git::conflict) $ cat readme
- more text
- ~/git-bug (git::conflict) $ git commit -a -m "first in conflict branch"
- Created commit 7928b0b: first in conflict branch
- 1 files changed, 1 insertions(+), 1 deletions(-)
- ~/git-bug (git::conflict) $ git checkout master
- Switched to branch "master"
- ~/git-bug (git::master) $ echo "a conflict" > readme
- ~/git-bug (git::master) $ git commit -a -m "and here's our conflict"
- Created commit 5ce7f01: and here's our conflict
- 1 files changed, 1 insertions(+), 1 deletions(-)
- ~/git-bug (git::master) $ git checkout conflict
- Switched to branch "conflict"
- ~/git-bug (git::conflict) $ git rebase master
- First, rewinding head to replay your work on top of it...
- Applying first in conflict branch
- error: patch failed: readme:1
- error: readme: patch does not apply
- Using index info to reconstruct a base tree...
- Falling back to patching base and 3-way merge...
- Auto-merged readme
- CONFLICT (content): Merge conflict in readme
- Failed to merge in the changes.
- Patch failed at 0001.
- When you have resolved this problem run "git rebase --continue".
- If you would prefer to skip this patch, instead run "git rebase --skip".
- To restore the original branch and stop rebasing run "git rebase --abort".
- ~/git-bug (git::(no branch)) $ cat readme
- <<<<<<< HEAD:readme
- a conflict
- =======
- more text
- >>>>>>> first in conflict branch:readme
- ~/git-bug (git::(no branch)) $ echo "a conflict" > readme
- ~/git-bug (git::(no branch)) $ cat readme
- a conflict
- ~/git-bug (git::(no branch)) $ git add readme
- ~/git-bug (git::(no branch)) $ git rebase --continue
- Applying first in conflict branch
- No changes - did you forget to use 'git add'?
- When you have resolved this problem run "git rebase --continue".
- If you would prefer to skip this patch, instead run "git rebase --skip".
- To restore the original branch and stop rebasing run "git rebase --abort".
- ~/git-bug (git::(no branch)) $ echo "" >> readme
- ~/git-bug (git::conflict) $ cat readme
- a conflict
- ~/git-bug (git::(no branch)) $ git add readme
- ~/git-bug (git::(no branch)) $ git rebase --continue
- Applying first in conflict branch
- ~/git-bug (git::conflict) $
Add Comment
Please, Sign In to add comment