spraints/git-tfs — Issue #106: Partly completed rcheckin leaves Git in bad state
Author: sc68cal
Created: 2011-11-19 16:14:15+00:00
State: open

During an rcheckin operation, a file was updated on the TFS side, stopping the rcheckin operation. After rebasing the commits that did not go back into TFS, I attempted to resume my workflow, but had difficulty doing any further rcheckin operations.

[Backtrace](https://gist.github.com/1378989)

Doing a subsequent tfs pull brought in further changes from the TFS side, but they were not connected to the history.

![Imgur](http://i.imgur.com/F3x98)

Doing a fresh `git tfs clone` did not cause any problems and I have been able to resume working as usual, but this seems like a very subtle bug that could cause trouble.

I have saved the repo and will build a debug version so that I can step through it in Visual Studio.