This project is read-only.

Git TF architecture

Aug 19, 2015 at 2:22 PM
Edited Aug 19, 2015 at 2:41 PM
Hi,

we are developing in a team and i wonder if this architecture would be working. I want to be sure because I can´t test it on our live TFS in case "just to try it".

So we use 1 Git repo to work in a team....
and 1 TFS to push the stable version from git.

But there is one more thing, because on the TFS there are other guys who are working on it and pushing their changes so we need a script which pulls the changes from

TFS -> Git
and from
Git -> TF.

Image

So here is the code:
git pull
git tf configure http://myserver:8080/tfs/mycollection $/TeamProjectA/Main 
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push
OR Like this?
git pull
git tf configure http://myserver:8080/tfs/mycollection $/TeamProjectA/Main 
git tf pull
git push
git tf shelve
Aug 24, 2015 at 7:23 PM
Hi,
  1. Do you know that to use Git-TF you have to maintain a linear history in the master branch? I.e. you should always rebase your changes from other branches onto master and never just merge them.
  2. Do your developers use one and the same instance of the Git repository, or all of them clone their local repository instances from the main Git repository?