我试着做git rebase，并在此过程中丢失了一个文件。这不是一个非常重要的文件，但我想了解发生了什么。
我想使用rebase命令将分支'master'合并到分支'learning'中。
以下是我的行动摘要：
git rebase master，发生了冲突，解决了它，尝试继续rebase，再次失败了更多冲突，添加/提交了一个未跟踪的文件，再次失败了rebase，尝试了rebase --skip，失败，aborted rebase，最后做了git merge，这是成功的。
我在rebase期间提交的未跟踪文件（test.py）现已消失。
以下是我的行动的详细记录：
$git checkout learning
Switched to branch 'learning'
Your branch is up to date with 'origin/learning'.
$git rebase master
First, rewinding head to replay your work on top of it...
Applying: first commit: changed mnist example trainer
Using index info to reconstruct a base tree...
A examples/mnist-convnet.py
Falling back to patching base and 3-way merge...
Auto-merging examples/basics/mnist-convnet.py
Applying: added print tensor callback to run after each epoch
Using index info to reconstruct a base tree...
A examples/mnist-convnet.py
Falling back to patching base and 3-way merge...
Auto-merging examples/basics/mnist-convnet.py
Applying: trying to make callback for mnist-visualization
Using index info to reconstruct a base tree...
A examples/mnist-convnet.py
A examples/mnist-visualizations.py
Falling back to patching base and 3-way merge...
Auto-merging examples/basics/mnist-visualizations.py
Auto-merging examples/basics/mnist-convnet.py
Applying: still trying to convert visualization into a callback
Using index info to reconstruct a base tree...
A examples/mnist-visualizations.py
Falling back to patching base and 3-way merge...
Auto-merging examples/basics/mnist-visualizations.py
Applying: misc changes to visualization
Using index info to reconstruct a base tree...
A examples/mnist-visualizations.py
Falling back to patching base and 3-way merge...
Auto-merging examples/basics/mnist-visualizations.py
Applying: added VisualizeTensors callback
Using index info to reconstruct a base tree...
A examples/mnist-visualizations.py
Falling back to patching base and 3-way merge...
Auto-merging examples/basics/mnist-visualizations.py
Applying: first commit: changed mnist example trainer
Using index info to reconstruct a base tree...
A examples/mnist-convnet.py
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: added print tensor callback to run after each epoch
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A examples/mnist-convnet.py
Falling back to patching base and 3-way merge...
Auto-merging examples/basics/mnist-convnet.py
CONFLICT (content): Merge conflict in examples/basics/mnist-convnet.py
Patch failed at 0008 added print tensor callback to run after each epoch
The copy of the patch that failed is found in: .git/rebase-apply/patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
$git status
rebase in progress; onto 4142b9e7
You are currently rebasing branch 'learning' on '4142b9e7'.
(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: examples/basics/mnist-convnet.py
Untracked files:
(use "git add <file>..." to include in what will be committed)
examples/basics/test.py
no changes added to commit (use "git add" and/or "git commit -a")
$git add examples\basics\mnist-convnet.py
$git status
rebase in progress; onto 4142b9e7
You are currently rebasing branch 'learning' on '4142b9e7'.
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: examples/basics/mnist-convnet.py
Untracked files:
(use "git add <file>..." to include in what will be committed)
examples/basics/test.py
$git commit -am "fixing mnist-convnet conflict"
[detached HEAD 2835adcc] fixing mnist-convnet conflict
1 file changed, 2 insertions(+), 1 deletion(-)
$git status
rebase in progress; onto 4142b9e7
You are currently rebasing branch 'learning' on '4142b9e7'.
(all conflicts fixed: run "git rebase --continue")
Untracked files:
(use "git add <file>..." to include in what will be committed)
examples/basics/test.py
nothing added to commit but untracked files present (use "git add" to track)
$git rebase --continue
Applying: added print tensor callback to run after each epoch
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.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
$git status
rebase in progress; onto 4142b9e7
You are currently rebasing branch 'learning' on '4142b9e7'.
(all conflicts fixed: run "git rebase --continue")
Untracked files:
(use "git add <file>..." to include in what will be committed)
examples/basics/test.py
nothing added to commit but untracked files present (use "git add" to track)
$git add examples\basics\test.py
$git commit -am "added test"
[detached HEAD 9f32ce6d] added test
1 file changed, 23 insertions(+)
create mode 100644 examples/basics/test_FP16_vs_FP32.py
$git status
rebase in progress; onto 4142b9e7
You are currently rebasing branch 'learning' on '4142b9e7'.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working tree clean
$git rebase --continue
Applying: added print tensor callback to run after each epoch
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.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
$git rebase --skip
Applying: trying to make callback for mnist-visualization
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A examples/mnist-convnet.py
A examples/mnist-visualizations.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): examples/mnist-visualizations.py deleted in HEAD and modified in
trying to make callback for mnist-visualization. Version trying to make
callback for mnist-visualization of examples/mnist-visualizations.py left in tree.
Auto-merging examples/basics/mnist-convnet.py
CONFLICT (content): Merge conflict in examples/basics/mnist-convnet.py
Patch failed at 0009 trying to make callback for mnist-visualization
The copy of the patch that failed is found in: .git/rebase-apply/patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
$git status
rebase in progress; onto 4142b9e7
You are currently rebasing branch 'learning' on '4142b9e7'.
(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/rm <file>..." as appropriate to mark resolution)
both modified: examples/basics/mnist-convnet.py
deleted by us: examples/mnist-visualizations.py
no changes added to commit (use "git add" and/or "git commit -a")
$git rebase --abort
$git status
On branch learning
Your branch is up to date with 'origin/learning'.
nothing to commit, working tree clean
$git merge master
Merge made by the 'recursive' strategy.
...
78 files changed, 880 insertions(+), 539 deletions(-)
$dir examples\basics
Directory of \Code\tensorpack\examples\basics
03/01/2018 03:19 PM <DIR> .
03/01/2018 03:19 PM <DIR> ..
03/01/2018 03:19 PM 6,846 cifar-convnet.py
03/01/2018 03:19 PM 5,994 mnist-convnet.py
02/14/2018 12:58 PM 5,828 mnist-tflayers.py
02/12/2018 07:14 PM 3,488 mnist-tfslim.py
03/01/2018 03:01 PM 6,624 mnist-visualizations.py
02/12/2018 07:14 PM 4,166 svhn-digit-convnet.py
02/15/2018 03:43 PM <DIR> train_log
6 File(s) 32,946 bytes
3 Dir(s) 86,909,169,664 bytes free
正如您所看到的，曾经在示例\基础知识中的test.py已经消失。
所以，我想了解两件事：为什么git rebase会因冲突而失败，但git merge会很好？在rebase操作期间我提交的未跟踪文件发生了什么？
答案 0 :(得分：1)
首先，不将master合并到learning中：git rebase master将在learning之上重播master。
其次，如果您在任何时候添加/提交了test.py，则可以find it back in the reflog。请参阅＆＃34; Query git reflog for all commits to a specific file＆＃34;。
git rev-list --all -- test.py
第三，在rebase期间，你不应该提交，only to add, then git rebase --continue。