git rebase after sync upstream master

git-rebase

$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: config test for dae
Using index info to reconstruct a base tree...
M	apitests/framework.py
M	tests/test_commodity/framework.py
<stdin>:48: trailing whitespace.
dae test -p -- ilmen/apitests/ --junitxml=ilmen/reports/apitest_v2/nose.xml --cov=ilmen.view.commodity.api.v2 || RET=$?
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging tests/test_commodity/framework.py
Auto-merging apitests/framework.py
Applying: fix
Using index info to reconstruct a base tree...
M	apitests/framework.py
Falling back to patching base and 3-way merge...
Auto-merging apitests/framework.py
CONFLICT (content): Merge conflict in apitests/framework.py
Failed to merge in the changes.
Patch failed at 0002 fix
The copy of the patch that failed is found in:
   /home/vagrant/apps/ilmen/.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".


~/apps/ilmen on ⭠ 70e5f41! ⌚ 18:30:00
$ git stash
apitests/framework.py: needs merge
apitests/framework.py: needs merge
apitests/framework.py: unmerged (8af9a6a309550b46343ca18e5eb52757133ca1e3)
apitests/framework.py: unmerged (4522e57efea1e18f5ba0cee9b3fb1dc15d503137)
apitests/framework.py: unmerged (3f7af60af1ef99a3a718f617911609fb64487b4b)
fatal: git-write-tree: error building trees
Cannot save the current index state

~/apps/ilmen on ⭠ 70e5f41! ⌚ 18:33:43
$ git mergetool
Merging:
apitests/framework.py

Normal merge conflict for 'apitests/framework.py':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (vimdiff):
4 files to edit

~/apps/ilmen on ⭠ 70e5f41! ⌚ 18:33:57
$ git add .

~/apps/ilmen on ⭠ 70e5f41! ⌚ 18:34:01
$ git rebase --continue
Applying: fix
Applying: add pylintplugin.stdlib_fixup
Applying: update
Using index info to reconstruct a base tree...
M	apitests/framework.py
Falling back to patching base and 3-way merge...
Auto-merging apitests/framework.py
Applying: use pylintplugin package
Applying: update pylint use venv
Applying: add pylint 0.26.0 for pylintplugin
Applying: delete .orig
Using index info to reconstruct a base tree...
M	apitests/framework.py.orig
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): apitests/framework.py.orig deleted in delete .orig and modified in HEAD. Version HEAD of apitests/framework.py.orig left in tree.
Failed to merge in the changes.
Patch failed at 0008 delete .orig
The copy of the patch that failed is found in:
   /home/vagrant/apps/ilmen/.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".

commit 1e0b26d46618e04ed9f5e4c704f8180741841c60
Author: liutianwei <liutianwei>
Date:   Mon Mar 24 11:51:41 2014 +0800

    try to delete insert path

commit 5651271a1638b4958799145317d4bc98946f030e
Author: liutianwei <liutianwei>
Date:   Mon Mar 24 11:15:10 2014 +0800

    delete .orig


~/apps/ilmen on ⭠ 8dc95a7! ⌚ 18:34:11
$ git status
commit 1e0b26d46618e04ed9f5e4c704f8180741841c60
Author: liutianwei <liutianwei>
Date:   Mon Mar 24 11:51:41 2014 +0800

    try to delete insert path
# rebase in progress; onto b5b0468
# You are currently rebasing branch 'config-dae-test' on 'b5b0468'.
#   (fix conflicts and then run "git rebase --continue")
Rebasing (5/9)
#   (use "git rebase --skip" to skip this patch)
#   (use "git rebase --abort" to check out the original branch)
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	deleted by them:    apitests/framework.py.orig
#
no changes added to commit (use "git add" and/or "git commit -a")
Rebasing (8/9)

~/apps/ilmen on ⭠ 8dc95a7! ⌚ 18:34:14
$ git rm -rf apitests/framework.py.orig
apitests/framework.py.orig: needs merge
rm 'apitests/framework.py.orig'

~/apps/ilmen on ⭠ 8dc95a7! ⌚ 18:34:22
$ git rebase --continue
Applying: delete .orig
Applying: try to delete insert path
Applying: post owner should can delete post's comment
Using index info to reconstruct a base tree...
M	view/commodity/api/v2/comment.py
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: update pylint use venv
Using index info to reconstruct a base tree...
M	tools/run_pylint.sh
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: add pylint 0.26.0 for pylintplugin
Using index info to reconstruct a base tree...
M	pip-req.txt
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: try to delete insert path
Using index info to reconstruct a base tree...
M	tests/framework.py
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

~/apps/ilmen on ⭠ config-dae-test ⌚ 18:34:28
$ git log

赞