힘내 rebase 병합 충돌을 계속할 수 없습니다

힘내 rebase 병합 충돌을 계속할 수 없습니다

---

'마스터'분기를 따라 잡기 위해 'dev'를 리베이스하려고합니다.

$ git checkout dev 
$ git rebase master 
First, rewinding head to replay your work on top of it...
Applying: Corrected compilation problems that came from conversion from SVN.
Using index info to reconstruct a base tree...
M       src/com/....
<stdin>:125: trailing whitespace.
/**
<stdin>:126: trailing whitespace.
 *
<stdin>:127: trailing whitespace.
 */
<stdin>:128: trailing whitespace.
package com....
<stdin>:129: trailing whitespace.

warning: squelched 117 whitespace errors
warning: 122 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging src/com/....
CONFLICT (content): Merge conflict in src/com/...
Failed to merge in the changes.
Patch failed at 0001 Corrected compilation problems that came from conversion from SVN.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".

$ vi src/com/.....   { fixed the merge issue on one file } 
$ git add -A . 
$ git rebase --continue 
src/com/....: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
$ vi src/com....      { verified, no >>> or <<< left, no merge markers } 
$ git rebase --continue 
Applying: Corrected compilation problems that came from conversion from SVN.
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 would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".

어떤 아이디어?

---

내가 본 두 가지 상황이 있습니다 rebase. 하나는 변경 사항이 널이되거나 (커밋이 이미 rebase에서 작성된 변경 사항을 갖는 경우) 사용하는 경우 git rebase --skip입니다.

말하기 쉽다. 당신이 할 경우 git status는 변경이 없어야한다. 그렇다면 그냥 건너 뛰십시오. 그렇지 않은 경우 사본을 게시하면 git status도움을 드릴 수 있습니다.

---

내가이 문제에 부딪친 시간 중 하나는 git commit후를 할 때 git add입니다. 따라서 다음 순서는 언급 한 rebase 오류를 생성합니다.

git add <file with conflict>
git commit -m "<some message>"
git rebase --continue

아래의 시퀀스는 오류없이 실행되며 리베이스를 계속합니다.
git add <file with conflict>
git rebase --continue

It might be possible that git add -A with the "All" option is creating a similar situation. (Please note, I am very inexperienced in git, so this answer may not be correct.) To be safe, the git rebase --skip seems to also work well in this situation.

---

Note: Git 2.0.2 (July 2014) has fixed one case where a git rebase --skip would get stuck and wouldn't be able to go on with the current rebase.
See commit 95104c7 by brian m. carlson (bk2204)

rebase--merge: fix --skip with two conflicts in a row

If git rebase --merge encountered a conflict, --skip would not work if the next commit also conflicted.
The msgnum file would never be updated with the new patch number, so no patch would actually be skipped, resulting in an inescapable loop.

Update the msgnum file's value as the first thing in call_merge.
This also avoids an "Already applied" message when skipping a commit.
There is no visible change for the other contexts in which call_merge is invoked, as the msgnum file's value remains unchanged in those situations.

---

$ vi src/com....      { verified, no >>> or <<< left, no merge markers } 
$ git rebase --continue 

Looks like you forgot to git add your changes...

참고URL : https://stackoverflow.com/questions/14410421/git-rebase-merge-conflict-cannot-continue