/ git

git-rebase

$ git rebase -i c642e62

当发生冲突时:

$ git status
rebase in progress; onto 1e8fb0e
You are currently rebasing branch 'develop' on '1e8fb0e'.
  (fix conflicts and then run "git rebase --continue")
  (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 <file>..." to mark resolution)

        both modified:   src/index.js

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        src/index.js.rej

no changes added to commit (use "git add" and/or "git commit -a")