當混帳TFS無法創建合併提交,它說 warning: this changeset 7504 is a merge changeset. But it can't have been managed accordingly because one of the parent changeset 7494 is not present in the repository! If you want to do it, fetch the branch containing this changeset before retrying...
當混帳TFS無法創建合併提交,如何糾正它
按照該documentation,Note: if you see a warning, you could correct that by reseting the tfs remote to a previous commit. Then fetch the merged branch and retry to fetch the branch.
任何人都可以請詳細說明reseting the tfs remote to a previous commit
。雖然,我現在已經提取了合併的分支,我不明白如何將它重置爲之前提交給失敗的分支。我不確定,但是我必須git checkout <hash of the previous commit>
?
我已經添加了我使用的命令根據我的理解你的答案。如有任何錯誤請糾正。 – IsmailS
這很好。只是更新以保存一個命令(使用拉取代fetch + reset),並添加了一個不告訴使用'git clone --with-branches'來避免這種情況... – Philippe
如果你有v0.19.2,你可以在所有git-tfs命令中使用選項'-I'而不是'-i nameOfMyRemote',它將選擇好的遠程使用.... – Philippe