Is this workflow reasonable?
1. Each dev has their own git repo and pulls from TFS. All work is done on master.
2. Commit any working directory changes
3. git tf pull --rebase
4. TortoiseGit -> Resolve...
- use tortoise' merge tool on each file
- tortoise recommends you commit but warns about detached head
- tell tortoise to commit but don't create a new branch
5. git rebase --continue
6. git tf checkin