Questions tagged [git-tfs]

Git-Tfs is a Windows open sourced two-way bridge between TFS(TFVC) and git, similar to git-svn.

Git-tfs is a command-line based source control bridge that allows you to work with Git locally, reducing the number of operations to communicate with the TFS source control server to exactly three operations: Clone, Checkin and Fetch (or Pull).

Major features

  • Clone a TFVC repository in a git repository
  • Syncing new changesets/commits (fetch, pull and rcheckin)
  • TFS branch support with merge support
  • Shelveset support
  • Workitems support
  • Migrate from TFVC to Git

Online resources

204 questions
8
votes
4 answers

Installing Git-TFS without Git itself

Currently, the only way to install the Git-TFS bridge is through Chocolatey. When I tried it, however, it appears to install Git (for Windows) along with the actual Git-TFS package. I already have Git installed on my work machine, so I don't need it…
Isxek
  • 1,096
  • 11
  • 19
7
votes
2 answers

TFS source control case sensitivity

TFS has a funny habit of mixing up case in folders. For example, some developers might check in $/FooBar/readme.txt while others may check in $/Foobar/readme.txt. Is there anyway to force TFS to treat files/folders as case-sensitive? For example, if…
syvex
  • 7,518
  • 9
  • 43
  • 47
7
votes
3 answers

How to use git tfs with a team

I recently started using git tfs as a bridge between working and committing locally with git and then comitting to tfs to go through our continuous integration system and share with team members. I would like to start collaborating with my team…
Evan
  • 5,925
  • 6
  • 33
  • 35
7
votes
2 answers

Possible to use git project AND see TFS work items in VS2013?

So I've upgraded to VS2013, hopefully for all development. One thing really irks me about it though. My team uses TFS, and I prefer git, so I use git-tfs to bridge the two for source control. We use TFS work items for tracking of bugs and stories…
Earlz
  • 62,085
  • 98
  • 303
  • 499
6
votes
4 answers

Is there a way to suppress VS trying to go online?

If there's configured binding of the solution with TFS, when you opening a solution VS asks you: --------------------------- Microsoft Visual Studio --------------------------- Go Online This solution is offline but its associated Team Foundation…
Ivan Danilov
  • 14,287
  • 6
  • 48
  • 66
6
votes
3 answers

git-tfs: A shelved pending change on a file is required

I'm trying out git-tfs, and I'm trying to unshelve a shelveset by running the following: git tfs unshelve "Shelveset Name" shelf I'm getting the following error: A shelved pending change on a file is required: $/path/to/dir/deleted "deleted" is a…
Andrew
  • 1,494
  • 1
  • 17
  • 27
6
votes
2 answers

Git-tfs trying to pull from old tfs server instead of our new one

My team transferred our tfs from an old server to a new one a little bit ago. We are using git tfs to manage our local changes and to push them into tfs. However I am running into an issue when I clone a exsisting repo from tfs like so git tfs…
jpalladino84
  • 2,480
  • 2
  • 15
  • 16
5
votes
1 answer

git - setting path variable

When I run the following command to change my path variable in the git bash - it works. After I've run a few git-tfs commands it reverts back to the original setup. Is it possible to explain why? $ PATH=$PATH:my git-tfs path goes here To clarify, it…
user880954
  • 7,317
  • 6
  • 22
  • 20
5
votes
2 answers

How to run or install tool on hosted agent in VSTS

I want to run cmd as an administrator on VSTS. Actaully I am trying to install git-tfs with chocolatey tool manager on VSTS hosted agent, So I am running the following command on VSTS command line…
Twinkle
  • 394
  • 4
  • 17
5
votes
1 answer

Migrate Git repository to new TFVC repository

How do you use git-tfs to mirror/copy an existing Git repository to a NEW TFS 2010 TFVC repository? The existing Git repository was NOT cloned from TFS. I need to move the source code from our master branch in our remote/local Git repository into…
5
votes
0 answers

will adding .gitconfig in repository override my global .gitconfig file configurations?

I am having my project hosted in TFS-GIT server. I am having an issue with pull request merges on TFS . one option is to update git configs on TFS server itself to make "merges --no--ff" because of time crunch and other issues that cannot be done…
nikned
  • 171
  • 2
  • 12
5
votes
1 answer

git tfs clone with partial history

I'm trying to migrate a TFS repository to git, but I've run into an issue. Looking at the history of this particular repository in TFS, it looks as though the parent was copied into a new TFS repository and then at a later time the parent was…
Ryan.Bartsch
  • 3,698
  • 1
  • 26
  • 52
5
votes
1 answer

How to resolve discrepancies found by Git-TFS verify

Git-TFS has a verify command, which the help describes thus: "The verify command helps identify inaccuracies of a fetch, clone or quick-clone from TFS." I have a proprietary repository which I am migrating from TFS to Git. Running git tfs verify…
Keith Pinson
  • 7,835
  • 7
  • 61
  • 104
5
votes
1 answer

When git tfs could not create a merge commit, how to correct it

When git tfs could not create a merge commit, it says 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,…
IsmailS
  • 10,797
  • 21
  • 82
  • 134
5
votes
3 answers

Using git-tfs fetch to get latest causes a merge conflict

I have an issue attempting to pull my latest changes from TFS and adding them to a BitBucket repo. I have successfully pushed my branches into BitBucket, but when I attempt to get any new checkins from TFS I always get a merge conflict. Steps: git…
Simply Ged
  • 8,250
  • 11
  • 32
  • 40
1
2
3
13 14