Skip to content

Instantly share code, notes, and snippets.

@abinashmeher999
Last active August 29, 2015 14:16
Show Gist options
  • Save abinashmeher999/e535ec01b8af5ac1a477 to your computer and use it in GitHub Desktop.
Save abinashmeher999/e535ec01b8af5ac1a477 to your computer and use it in GitHub Desktop.
Rebasing problem
abinashmeher999@JARVIS:~/agv/git-sandbox$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Added 'Abinash Meher'
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
Failed to merge in the changes.
Patch failed at 0001 Added 'Abinash Meher'
The copy of the patch that failed is found in:
/home/abinashmeher999/agv/git-sandbox/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
abinashmeher999@JARVIS:~/agv/git-sandbox$ gvim README.md
abinashmeher999@JARVIS:~/agv/git-sandbox$ git rebase --continue
README.md: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
abinashmeher999@JARVIS:~/agv/git-sandbox$ git add README.md
abinashmeher999@JARVIS:~/agv/git-sandbox$ git commit
[detached HEAD e84ed15] Fixed merge conflict while rebasing
1 file changed, 2 insertions(+), 1 deletion(-)
abinashmeher999@JARVIS:~/agv/git-sandbox$ git rebase --continue
Applying: Added 'Abinash Meher'
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
abinashmeher999@JARVIS:~/agv/git-sandbox$ git status
rebase in progress; onto 083c0a8
You are currently rebasing branch 'abinash' on '083c0a8'.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working directory clean
abinashmeher999@JARVIS:~/agv/git-sandbox$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment