0
我正在尝试从develop分支到我的功能分支进行rebase。正如in this Stackoverflow post所述,我希望合并冲突的文件能够写出我的同样的特性分支文件。Git Rebase策略他们不覆盖
不过,我有一个区别的行为。
为什么
VDPGallery
显示为将被覆盖的文件?它不显示我是否git merge develop
或git rebase develop
为什么它告诉我
Please commit your changes or stash them before you merge. Aborting
?这应该会自动覆盖冲突文件。另外,所有的文件都在重新绑定之前被推送并提交。$ git rebase -s recursive -X theirs develop First, rewinding head to replay your work on top of it... error: Your local changes to the following files would be overwritten by merge MarketPlace.Web/Marketplace.WebUI/Scripts/components/VDPGallery MarketPlace.Web/Marketplace.WebUI/css/am/site.css MarketPlace.Web/Marketplace.WebUI/css/am/site_l.css MarketPlace.Web/Marketplace.WebUI/css/am/site_m.css MarketPlace.Web/Marketplace.WebUI/css/site.css MarketPlace.Web/Marketplace.WebUI/css/site_l.css MarketPlace.Web/Marketplace.WebUI/css/site_m.css Please commit your changes or stash them before you merge. Aborting Unknown exit code (128) from command: git-merge-recursive 8b499ab98b4f23ad30ab2d5bafd9695f8405f^ -- HEAD 8b499ab98b4f23ad30a3b8b2d5bafd9695f8405f
我没有时间看更接近,但这是某种错误时,你有你的工作树* *未追踪文件你,那你会重订之上,将覆盖*跟踪*文件的未跟踪的人。 – torek
'git status'说什么? – dcsohl
'没有提交,工作树干净'。我确信我没有未跟踪的文件。 – dman