Coffeehouse Thread

26 posts

Forum Read Only

This forum has been made read only by the site admins. No new threads or comments can be added.

Git with Visual Studio

Back to Forum: Coffeehouse
  • User profile image
    Bass

    Does anyone writing C# code use Git and how do you typically work with Git?

  • User profile image
    blowdart

    All the new ASP.NET katana pieces were written using git as source control.

    So there's a release branch, and a dev branch, everyone forks dev, then some, for isolated features fork locally for that. I usually started the day with pulling down everything everyone else did the day before, even rebasing. Pull requests were done after code review using an internal tool. Then the asp.net build system pulls dev for the nightly myget feed.

  • User profile image
    Bass

    Do you use any Git addins for VS?

  • User profile image
    blowdart

    , Bass wrote

    Do you use any Git addins for VS?

    I didn't, I used Posh Git mostly. Don't know what the others used.

  • User profile image
    RealBboy360

    online tfs is free for under 5 people and easy to use, i'd use that instead

  • User profile image
    Duncanma

    @Bass: The Channel 9 team uses Git with VS, but hosted in the online TFS system. We all do different things, oddly enough. I use VS's git integration to commit changes, but do all my other git work in bash. Some of the team uses http://www.sourcetreeapp.com/ , and at least one uses git through powershell. We are using the git-flow style of branching, releases, hotfixes, etc... http://nvie.com/posts/a-successful-git-branching-model/

  • User profile image
    blowdart

    , RealBboy360 wrote

    online tfs is free for under 5 people and easy to use, i'd use that instead

    Yes, and it comes with git support too. You realised that right?

  • User profile image
    Bas

    I'm thinking of moving our company source control to Git, but I still have to play with the TFS support. For my own personal stuff I use Github for Windows, except instead of Github I use Bitbucket (free for non-public projects).

    Sometimes when GHfW is being a pain I just use powershell.

  • User profile image
    fanbaby

    TFS ~ XAML

    Wink

  • User profile image
    Bass

    Thanks guys. When you say Git "TFS support", do you mean Visual Studio for support for Git (committing, viewing history, etc. using the GUI) or TFS as a source control system implementing the Git protocol?

    I've had issues with Microsoft's implementation of the Git protocol in the past (namely, not being able to interact with Microsoft's emulated Git repos from GNU/Linux because of some incompatibility with Microsoft's implementation of SSL), so I'd prefer to avoid any kind of server software that tries to emulate a Git repo but is really some other kind of source control system. Also, I'd like to keep Git's on-disk format because I often copy entire repos between systems.

    But if it just interacts with vanilla Git on the back end, an offers an IDE integrated GUI that would be ideal. Something like the Git plugin in Eclipse really.

     

  • User profile image
    cbae

    , Bass wrote

    Thanks guys. When you say Git "TFS support", do you mean Visual Studio for support for Git (committing, viewing history, etc. using the GUI) or TFS as a source control system implementing the Git protocol?

    I've had issues with Microsoft's implementation of the Git protocol in the past (namely, not being able to interact with Microsoft's emulated Git repos from GNU/Linux because of some incompatibility with Microsoft's implementation of SSL), so I'd prefer to avoid any kind of server software that tries to emulate a Git repo but is really some other kind of source control system. Also, I'd like to keep Git's on-disk format because I often copy entire repos between systems.

    But if it just interacts with vanilla Git on the back end, an offers an IDE integrated GUI that would be ideal. Something like the Git plugin in Eclipse really.

    I've not used TFS extensively, but it is way more than source control. It also has a project management and build components to it among other things. As far as I can tell, at least from how Team Foundation Service (i.e. TFS online) works, is that you can use either TFS's native version control system or Git. It seems to be the actual Git version control system (and repository)--not just the protocol.

    Hell, just look at the website:

    http://tfs.visualstudio.com/en-us/pricing/tfs-information

    http://tfs.visualstudio.com/en-us/learn/create-code-project-vs-git

    BTW, Microsoft should have really named this service "TFS Online" instead of "Team Foundation Service" to avoid the confusion of what "TFS" refers to. They already use "Exchange Online" and "SharePoint Online" to brand their SaaS-versions of these applications.

  • User profile image
    blowdart

    , Bass wrote

    Thanks guys. When you say Git "TFS support", do you mean Visual Studio for support for Git (committing, viewing history, etc. using the GUI) or TFS as a source control system implementing the Git protocol?

    So I believe it may be the later, given when you create a project on TFS online you have to choose Git or TFS for the Version Control bits.

    Also there's been quite a few MS contributions to libgit2 this year.

    Hmm maybe there's a video in this for Charles? Big Smile

     

  • User profile image
    Duncanma
  • User profile image
    blowdart

    WAIT. ARE YOU BLOWING ME KISSES?

  • User profile image
    Duncanma

    @blowdart:honestly I think I've found an IE11 / Tiny MCE bug there... *and* I'm blowing you kisses

  • User profile image
    RealBboy360

    I'd rather have the source control and the current code on 1 main server (and other stuff TFS offers), just a personal preference though.  Git is for crazy hippies.

  • User profile image
    blowdart

    , RealBboy360 wrote

    I'd rather have the source control and the current code on 1 main server (and other stuff TFS offers), just a personal preference though.  Git is for crazy hippies.

    Umm, I think you're not understanding Git. But ok.

  • User profile image
    RealBboy360

    , blowdart wrote

    *snip*

    Umm, I think you're not understanding Git. But ok.

    You're probably right, I haven't looked at it for a while.

Conversation locked

This conversation has been locked by the site admins. No new comments can be made.