我们将TFS用于我们的源控制系统，但需要与承包商合作。我们已经设置了一个GitHub仓库，我一直在使用git-tfs来改变两者之间的变化。我对git不太熟悉，并设法让自己陷入困境。
git repo与TFS repo同步。承包商向GitHub提交了一些提交。之后，我检查了对TFS的一些更改，然后执行了git-tfs pull，然后与GitHub同步（通过GitHub for Window应用程序）。
我最近检入TFS的更改是在GitHub仓库中。承包商的变更是在GitHub仓库和我的本地仓库中，我正试图让他们进入TFS。当我运行git-tfs checkintool时，我得到：
Working with tfs remote: default
Basing from parent 'default:11102', use -i to override
Nothing to checkin!
如果我运行git-tfs rcheckin，我会得到以下内容。这显示了我尝试进入TFS的更改，但请注意底部The item $/RDi/Software/System/SZ-Working3/EmbeddedGui is not a branch of $/RDi/Software/System/SZ-Working3/EmbeddedGui.的消息。我认为这是问题所在，但我不确定如何纠正它。
Working with tfs remote: default
Basing from parent 'default:11102', use -i to override
Fetching changes from TFS to minimize possibility of late conflict...
Working on the merge commit: d2a85cd7b88715cabc6ed6cf5b9b7b5fc60359e0
Starting checkin of d2a85cd7 'Merge commit 'd36d26a6c6af5c1e89cf4dc7b2634964827b3ded'
Updated port screen PSD files. Should have what contractor needs regarding the animated arrows.
Replace language PSD files with new ones - the new ones contain the button pressed state for the OK/Cancel buttons.
Remove test file.
swiping removed from language page
Worked on issue 25: RemoteLib locks up when network settings update.
yes/no button added on language page'
edit .git\~w\QtJson/JObject.h
edit .git\~w\qml.qrc
add rsrc/images/480x272/common/no-small.png
add rsrc/images/480x272/common/yes-small.png
add rsrc/images/800x480/common/no-small.png
add rsrc/images/800x480/common/yes-small.png
edit .git\~w\rsrc/qml/pages/MetricsPage.qml
edit .git\~w\rsrc/qml/pages/RegionalSettingsEditorPage.qml
The item $/RDi/Software/System/SZ-Working3/EmbeddedGui is not a branch of $/RDi/Software/System/SZ-Working3/EmbeddedGui.
The item $/RDi/Software/System/SZ-Working3/EmbeddedGui is not a branch of $/RDi/Software/System/SZ-Working3/EmbeddedGui.