我最近就遇到了这个Web项目:git可以提示我为rebase上的每个文件吗?
git branch new-feature
git checkout new-feature
砍砍砍......
“博斯曼:哎,有一个在主人需要修复bug,弹指一挥间”
git commit -a -m "Partially completed migration changes"
git checkout master
git branch bugfix
git checkout bugfix
砍砍砍...... 测试测试测试...
“OK,固定的!”
git checkout master
git merge bugfix
走上完成的功能,但我们不要再介绍的bug ......
git checkout new-feature
git rebase master
First, rewinding head to replay your work on top of it...
Applying: some commit info
Using index info to reconstruct a base tree...
...
Auto-merging /some/buggy/file
CONFLICT (content): /some/buggy/file
Auto-merging /some/buggy/file
CONFLICT (content): /some/buggy/file2
Auto-merging /some/buggy/file
CONFLICT (content): /some/buggy/file3
...
如果我碰巧知道这特定文件是无关的新功能,我该怎么办交互强制文件从rebase源复制?
有没有办法告诉git
提示我的东西,如:
copy /some/buggy/file master? y/n
copy /some/buggy/file2 master? y/n
...