Using Git with Visual Studio 2013 Jump Start Q&A...

Using Git with Visual Studio 2013 Jump Start

Q&A Log

Live Event Date: March 12, 2014 of 20 DISCLAIMER: This information is provided to you for informational purposes only and is provided “as is.” Microsoft has not reviewed the information and it may contain inaccuracies. You bear the risk of using it. Microsoft makes no warranties, express or implied, as to the information.

08:41:19 PDT Question: Good morning. Answer: Hi Dale!

08:41:29 PDT

Question: Hi,😃 Answer: Welcome!

08:45:42 PDT Question: So enthusiastic for this Answer: Should be a great day! These instructors are awesome!

08:46:25 PDT Question: Hi MVA dear folks, good to be here again! Answer: Great to see you today Aldemar!

08:46:38 PDT Question: Good Morning, from Canada W.Coast new to VS Answer: Welcome!

08:47:00 PDT Question: Hi all Answer: Hi!

08:53:20 PDT Question: Hello from Slovenia Answer: Hi Jernej from Slovenia!

08:53:36 PDT Dwayne S. posted: Hi All, Joining from NY, my first live MVA event. Answer: Hi Dwayne, glad to have you with us!

08:54:17 PDT Question: Good Evening from Norway Answer: Hi Jan from Norway! I'm just south of you in Copenhagen!

08:54:31 PDT Question: Good afternoon from sunny Germany Answer: Hi Petyo from Germany!

08:55:51 PDT Question: Hi from sunny Germany Answer: Hi Georg, nice weather isn't it?

08:56:56 PDT Question: Hello from Skype Tallinn as well Answer: Hello Stanislav from Tallinn!

08:57:09 PDT Question: Hello from Dublin! Answer: hi nCoder!

08:57:51 PDT Question: Good Morning, this is Vinnie from Nashua NH Answer: Hi Vinnie!


Q&A Log


08:58:14 PDT Question: Good morning from horribly sunny SoCal! Answer: Are you taunting us up here Washington?

08:58:21 PDT Question: Good morning from horribly sunny SoCal! Answer: Hi A Brown!

08:58:33 PDT Question: Greetings from New Mexico Answer: Hello Sid Price from New Mexico!

08:58:34 PDT Question: Good morning/afternoon from a windy North Texas. Answer: Glad you can join us!

08:58:55 PDT Question: Good evening to everyone from India!! Answer: Hi Harshad! Must be late for you in India!

08:59:46 PDT Question: Lol...my apologies.

Answer: It's been a long winter I can't handle all the brightness down in SoCal myself to be honest!

08:59:54 PDT Question: Will the session be recorded?

Answer: Session will be recorded!

09:00:09 PDT Question: Hello All, this is Imran from UK Answer: Hi Imran from UK!

09:00:35 PDT Question: Good morning from Argentina! Answer: Morning Javier from Argentina! glad to have you with us!

09:01:31 PDT Question: Hello ^_^ , I am Guy from Israel. Answer: Hello Guy from Israel!

09:02:00 PDT Question: Good morning from Scotland Answer: Hi Gareth from Scotland!

09:02:26 PDT Question: It's only me or http://aka.ms/MVA-Voucher is taking forever to load?

Answer: it does take bit, doesn't it? Seems like we have a full house

09:05:20 PDT Question: Good morning from Kearney, NE Answer: Morning Don!

09:05:39 PDT Question: is there anything i should download b4 the lesson Answer: Check out the FAQ tab for the slides!

http://aka.ms/MVA-Voucher


Q&A Log


09:06:02 PDT Question: should I be receiving video/audio yet? Answer: It will be a few more minutes before we go live, but you should hear music.

09:06:23 PDT Question: Greetings from snowy Madison, Wisconsin Answer: Madison is a really fun town!

09:06:27 PDT Question: Hi from Rome, Italy Answer: Hi Giorgio! Rome is very beautiful city!

09:06:47 PDT Question: Ben from DC. I feel so much closer than I expected. Answer: Glad to hear that, Ben!

09:07:01 PDT Question: 11:05 PM my time as of now. poor me.! Answer: Thanks for staying up late with us!

09:07:03 PDT Question: Hi, I am Raju Hasan from Bangladesh Answer: Hi Raju, glad to have you here!

09:07:18 PDT Question: I'm Michael, good evening from Austria Answer: Hi Michael from Austria!

09:07:23 PDT Question: Good evening folks, from sunny (yes sunny) England Answer: Great user name, bigstilton!

09:07:38 PDT Question: Night From Australia

[[REPLY:]Go Oz Oz Oz!

09:07:41 PDT Question: Hi from the Opposite of Rome, Italy, Adelanto California! Answer: Great to see you today Sean!

09:07:57 PDT Question: hi.. Developers ... here is sunny from india (y) Answer: Hi Sunny!

09:07:58 PDT Question: Hello from the Gold Coast Australia Answer: Welcome, Neale!

09:08:10 PDT Question: I'm Luis good evening from Guatemala Answer: Bienvenido!

09:08:28 PDT Question: And today is a lovery sunny day Jonathan! Answer: Awesome!


Q&A Log


09:08:44 PDT Question: Good Afternoon from Norway Answer: Hi Romsdal! I'm just south of you in Copenhagen!

09:09:08 PDT Question: Evening from Sweden!

Answer: Hi mobilemancer! Where in Sweden?

09:09:25 PDT Question: Good evening from Pecs, Hungary! Answer: Hi Etelka from Pecs!

09:09:45 PDT Question: Linköping Answer: Nice!

09:09:46 PDT Question: Linköping Answer: Nice!

09:15:05 PDT Question: is there a donwload for hte powerpoint?

Answer: Yes, slides in the FAQ tab!

09:16:19 PDT Question: has it started - i hear nothing Answer: Yes, it has started.

09:18:08 PDT Question: Audio levels a bit low Answer: You can adjust volume by sliding the slider to the right, at the bottom of the video screen

09:18:22 PDT Question: Anyone else having problems with the voucher redemption link? It just keeps loading and loading in

Google Chrome. Answer: It works for me just about now.

09:19:52 PDT Question: Is recording of this session going to be available ?, if yes can you please provide URL Answer: Recording will be available in about 2 weeks.

09:21:22 PDT Question: is there central repository where recordings could be found? Answer: it is in MVA (microsoftvirtualacademy.com)

09:21:52 PDT Question: Do I need a git account already or will you do that as part of this session? Answer: Git doesn't require any kind of account. You may want to use GitHub or Visual Studio Online as a

repository. Those would require an account each.

09:31:35 PDT Question: Is Perforce (Source Depot) on the list? Answer: Yep, Perforce would be on the list!


Q&A Log


09:32:17 PDT Question: usually how long does it take to see the recorded video on the MVA for the ALM Wednesdays? Answer: The recording will be posted approx. 2 weeks later. The first session recording (Using Kanban on 3/5) will

be posted next week.

09:35:06 PDT Question: When two people are working on a file does it constantly merge? Or are there any problems with

overriding because people are working on them. Answer: You will learn more about this with "Git Fundamentals," There would be a merge conflict, so you would need

to compare the diffs yourself. You may want to do a Google search for "Merge conflicts with Git." There are different tools that you can use to help you compare files, such as KDiff3.

09:36:21 PDT Question: With GIT you can also just connect directly from local repo to another local repo.

https://www.atlassian.com/git/tutorial/remote-repositories#!remote Answer: @TimC I agree! You can connect to other repos as "remotes." You can also check out submodules and

subtrees, they are awesome.

09:37:52 PDT Question: What Git stands for?= Answer: @Aldemar It's actually pretty funny, the Git book gives a good answer: http://git-scm.com/book/en/Getting-

Started-A-Short-History-of-Git!

09:38:00 PDT Question: What Git stands for?= Answer: Hi Aldemar. Git was named by it's creator, Linux Torvalds, after himself as a "git" (in British English that's an

unpleasant person). So, a bit of humour rather than an abbreviation, I believe

09:38:53 PDT Question: > Quoted question: What Git stands for?= > Quoted answer: Hi Aldemar. Git was named by it's creator, Linux Torvalds, after himself as a "git" (in British English that's an unpleasant person). So, a bit of humour rather than an abbreviation, I believe

Answer: @Giles You're totally right!

09:44:05 PDT Question: Giles Davies, thank you for your explanation! Now I have a better understanding of "Git".

Answer: No problem

09:45:55 PDT Question: The presentation seems to suggest distributed repositories are always better - When isn't a distributed

system the best option? (i.e. in comparison with Perforce) [[REPLY:]Distributed repositories are good for certain kinds of development and not for others. I'm sure James and Steve will be covering those cases. Simplest reason to not use Git...I can rewrite history. This means that my auditors are going to freak out.

09:59:35 PDT Question: the link suggests to download Git-1.9.0-preview20140217.exe Is it ok? Answer: You can install it via chocolatey, https://chocolatey.org/packages?q=git, but also from this link: http://git-

scm.com/downloads

10:00:00 PDT Question: the link suggests to download Git-1.9.0-preview20140217.exe Is it ok? Answer: If you're on a windows machine, I'd hold off for a second; Steve & James will be showing a better Windows

installation method.

https://www.atlassian.com/git/tutorial/remote-repositories#!remote

http://git-scm.com/book/en/Getting-Started-A-Short-History-of-Git

http://git-scm.com/book/en/Getting-Started-A-Short-History-of-Git

https://chocolatey.org/packages?q=git

http://git-scm.com/downloads

http://git-scm.com/downloads


Q&A Log


10:00:17 PDT Question: What about between sessions ? How long is each section or session ? Answer: Checkout the Schedule tab for guideline. Although, as this is a live session, session may take longer/shorter

accordingly.

10:01:41 PDT Question: So, I can have my master repository meaning the one which is deploy on Windows and have my

developers working on Linux OS using Git? Answer: Yup. You can. You can also have devs working on iOS apps on a Mac using it.

10:03:40 PDT Question: why don't you Post the command here for us for PS install Answer: @powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object

net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%systemdrive%\chocolatey\bin

10:05:09 PDT Question: Is there a problem using the default installer from the web site? Answer: @Steve It's definitely fine installing from the Git web site, it's just cleaner to install posh git with chocolatey,

and then git with posh git. Same basic idea.

10:10:04 PDT Question: What is the difference between nuget.org and chocolatey? Answer: @Apioto Chocolatey is machine package manager, NuGet focused on developer library packages.

https://github.com/chocolatey/chocolatey/wiki/ChocolateyFAQs

10:11:38 PDT Question: earlier they mentioned "ALM Rangers". I found the MSDN Magazine article (http://msdn.microsoft.com/en-

us/magazine/hh394152.aspx). Is there a blog or web site? Answer: If you're interested in the Rangers, this is a good overview of who we are and what we do:

http://blogs.msdn.com/b/willy-peter_schaub/archive/2012/03/31/understanding-the-visual-studio-alm-rangers.aspx

10:12:07 PDT Question: getting error trying to install chocolatey Answer: @seaBruce Hmm, I can't tell if "new-object" you have has a space in it. Copy this? @powershell -NoProfile

-ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%systemdrive%\chocolatey\bin

10:12:59 PDT Question: earlier they mentioned "ALM Rangers". I found the MSDN Magazine article (http://msdn.microsoft.com/en-

us/magazine/hh394152.aspx). Is there a blog or web site? Answer: Here is the ALM Rangers Solutions Catalog. http://blogs.msdn.com/b/willy-

peter_schaub/archive/2013/05/16/visual-studio-alm-ranger-solutions-catalog.aspx

10:15:03 PDT Question: Can you change that user name or email later? Answer: Sure please rerun the git config commands at a later time to re-write these configurations

10:18:35 PDT Question: @Sachi that didn't work for me Answer: @seaBruce were you able to install poshgit successfully? And make sure you have the right permissions.

10:21:51 PDT Question: cinst returns "'cinst' is not recognized as an internal or external command, operable program or batch file." Answer: @Scott Did chocolatey install successfully?

https://chocolatey.org/install.ps1

https://github.com/chocolatey/chocolatey/wiki/ChocolateyFAQs

http://msdn.microsoft.com/en-us/magazine/hh394152.aspx


http://blogs.msdn.com/b/willy-peter_schaub/archive/2012/03/31/understanding-the-visual-studio-alm-rangers.aspx

https://chocolatey.org/install.ps1



http://blogs.msdn.com/b/willy-peter_schaub/archive/2013/05/16/visual-studio-alm-ranger-solutions-catalog.aspx

http://blogs.msdn.com/b/willy-peter_schaub/archive/2013/05/16/visual-studio-alm-ranger-solutions-catalog.aspx


Q&A Log


10:22:52 PDT Question: what would the command be to use Notepad++ as the global editor? Answer: I like Notepad++ as a global editor, It's got a nice UI and has been around for a while. But there are other

good editors to use, too. But be sure it's a fast editor.

10:23:37 PDT Question: I got the steps - entering "cinst" fails. Answer: Scott, did you restart the Command Prompt or Powershell window? You have to close and reopen for the

path to be enabled.

10:24:22 PDT Question: Hello - at what point is the execution policy changed - after chocolatey and before poshgit or after poshgit

installation? Answer: You can set this whenever you want to

10:24:43 PDT Question: no cinst poshgit starts some process but then several errors appear in red stating the path string is empty Answer: @Dale have you installed chocolatey in command prompt with elevated permissions?

10:25:51 PDT Question: The presentation seems to suggest distributed repositories are always better - When isn't a distributed

system the best option? (i.e. in comparison with Perforce) Answer: Whoops! I hope I didn't give THAT impression. We love TFVC and other centralized repos! Any time you

have a very large repo, or want people to take just a portion of the repo, centralized is better (in my opinion) Also, lots of large binary files.

10:26:41 PDT Question: James, could you copy / paste all the commands you used in powershell? Answer: For all our powershell commands, please download the slides. They're all there, but we'll also repost, and

will revisit this in the next session.

10:30:16 PDT Question: whats the link?? Answer: @Kevin http://git-scm.com/download

10:30:49 PDT Question: I hope nobody is still running Windows 95. Answer: +1

10:32:22 PDT Here's a good link to more information about settings with git config: http://git-scm.com/book/en/Customizing-Git-Git-Configuration

10:33:02 PDT Question: 'git' is not recognized as an internal or external command, operable program or batch file. Answer: @seaBruce Chocolatey, poshgit installed correctly, right? Make sure you're running as admin. Check out

Steve's steps in the video, hopefully that can help!

10:37:38 PDT

Manually adding git to the path: http://blog.countableset.ch/2012/06/07/adding-git-to-windows-7-path/

10:38:34 PDT Question: can you show the credential command again please? Answer: @seaBruce cinst git-credential-winstore

http://git-scm.com/download

http://git-scm.com/book/en/Customizing-Git-Git-Configuration

http://git-scm.com/book/en/Customizing-Git-Git-Configuration

http://blog.countableset.ch/2012/06/07/adding-git-to-windows-7-path/


Q&A Log


10:40:44 PDT Question: Thanks @Sachi, what are next steps after credentials? Very hard to follow the online install. Answer: @seaBruce Have you set the difftool? for diff tool: $ git config --global merge.tool vimdiff

10:45:07 PDT Question: I missed the steps on entering the path into the control panel Answer: @NGrimes7199 - Check out Andrew's link: http://blog.countableset.ch/2012/06/07/adding-git-to-windows-7-

path/

10:45:15 PDT Question: Adding Git to the path: http://blog.countableset.ch/2012/06/07/adding-git-to-windows-7-path/ Answer: Awesome, thanks, Andrew!

10:47:19 PDT Question: @Sachi, should I be doing anything to follow along, or just watch? Answer: I would suggest watching, then maybe after or during a break try it out yourself. Just so we don't get lost

A great resource to check out with this is http://git-scm.com/book and eventually http://pcottle.github.io/learnGitBranching/

10:48:55 PDT Question: can someone put the repo address here please? Answer: @Ganesh, as far as I'm aware, you won't have permission for this repo since it's a private one on Visual

Studio Online

10:51:58 PDT Question: Does this class explain how to build a repository? Answer: You can actually create a repo by "git init <NAME>" in the folder you want

10:54:23 PDT Question: But it will be empty with no files to play with

Answer: You can also create one in Command Prompt/Powershell

10:56:15 PDT Question: sent to Team: Any chance you can change dark red and green text to be lighter in Powershell,

James/Steve? Answer: Ack. No. We tried before but it doesn't work well.

10:59:37 PDT Question: C:\MyGitRepo [master]> git log fatal: bad default revision 'HEAD' What does the above error mean? Answer: Have you run git checkout master?

11:00:17 PDT Question: > Quoted question: C:\MyGitRepo [master]> git log fatal: bad default revision 'HEAD' What does the above error mean? > Quoted answer: Have you run git checkout master? Answer: Or some branch name?

11:00:54 PDT Question: C:\MyGitRepo [master]> git log fatal: bad default revision 'HEAD' What does the above error mean? Answer: Have you also made a commit yet?




http://git-scm.com/book

http://pcottle.github.io/learnGitBranching/


Q&A Log


11:02:15 PDT Question: I am going to stop troubleshooting my repo and follow on the video, otherwise it is getting hard to keep up

with the video

Answer: Good plan

11:04:54 PDT Question: Does anyone now of a good style guide for writing commit comments? Answer: @Gabriel http://git-scm.com/book/ch5-2.html

11:09:28 PDT Question: Is there a gui outside from VS that I could install? Answer: There are quite a few. Here's a good list of the available GUI clients for Git: http://git-

scm.com/downloads/guis

11:09:51 PDT Question: Does git work in version of VS other than the one shown? Answer: Git works in VS 2012 as well, but the experience isn't as smooth.

11:11:17 PDT Question: > Quoted question: Does git work in version of VS other than the one shown? > Quoted answer: Git works in VS 2012 as well, but the experience isn't as smooth. Answer: Link for extension for Git for Visual Studio 2012 v3 http://visualstudiogallery.msdn.microsoft.com/abafc7d6-

dcaa-40f4-8a5e-d6724bdb980c

11:13:00 PDT Question: I meant the different versions within vs 2013 like professional etc. Answer: In VS2013 the Git support is in all editions of Visual Studio from express, pro, premium and ultimate.

11:14:19 PDT Question: Does it work with Express 2012? Answer: The 2012 experience is far inferior to the 2013 experience.

11:18:25 PDT Question: Will Git work with Visual Studio 2010, and TFS 2008?

Answer: Unfortunately not in the IDE like the one Steven showed

11:21:45 PDT Question: Is there a graphical version tree browser for Git? Answer: @TedJohns check out http://git-scm.com/downloads/guis

11:22:30 PDT Question: So Git is supported in TFS2012? Does that mean that an existing TFS2012 installation can support Git

alongside normal TFVC? Answer: Yes, but you need to install the Git tools for VS.

11:28:22 PDT Question: I use TFS to work on a project with a friend. I still don't really understand in which cases It would be better

to use Git. I mean, the merge stuff and "saving it locally" is also available on a TFS project and much less complicated. But maybe I will get to know the advantages of using Git better later on this Jump start. Answer: Hi Guy, the big advantage of Git is that you have a complete copy of the repository locally. This allows you

to perform multiple check-ins/commits to your local repo which gives you points to which you can easily roll-back. Once you have the work completed, you can then commit the completed work up to the "master" repository. With centralized version control, all of the checkins/commits have to be stored on the central server so everyone in the team can pull them at any time. This tends to make devs checkin/commit less often than they would if they could control when their changes get to the central server.

http://git-scm.com/book/ch5-2.html

http://git-scm.com/downloads/guis


http://visualstudiogallery.msdn.microsoft.com/abafc7d6-dcaa-40f4-8a5e-d6724bdb980c

http://visualstudiogallery.msdn.microsoft.com/abafc7d6-dcaa-40f4-8a5e-d6724bdb980c



Q&A Log


11:30:33 PDT Question: Can you use cloud repositories such as bitbucket with Git in Visual Studio 2013? Answer: You can use any Git repository that is https enabled, regardless of where it is stored.

11:34:20 PDT Question: Isn't Git commits like shelvesets in TFS? Answer: A git commit is a full snapshot of everything in the repository at that time. that until sync'ed with anyone else

is only visible to yourself. A shelveset in TFS because of its centralised nature is stored on the server, but is visible by everyone else as soon as you create the shelveset.

11:35:16 PDT Question: @Steve, which means you have to consciously change the way you work to do a lot of fetches often to

make sure you are not getting too far from the main trunk which you hope to merge with eventually. Answer: To be honest, I perform Get Latest multiple times per day against my TFVC centralized repository. It's a

good practice whenever you are working with others and have a "master repository" declared.

11:38:48 PDT Question: How does that impact performance? Answer: Unfortunately, one of the drawbacks of Git is that if you have a giant repo with lots of binaries, that will

impact performance. But you also have other options, such as splitting up the repos.

11:41:17 PDT Question: @Sachi, in practice since the files are tracked by content, git performance is several times more efficient.

Since only changed files are moved over wire. The only item you will have large transfers is on initial checkout. Answer: @rev You're totally right! Sorry I didn't clarify that.

11:44:07 PDT Question: I used Label in perforce (our repository). Is there label in get? if yes how can we handle Label in get

otherwise is there a similar way? Answer: Yes Git has the notion of Tags for this sort of operation. I'm sure as the material unfolds that Tags will be

covered.

11:46:28 PDT Question: > Quoted question: I used Label in perforce (our repository). Is there label in get? if yes how can we handle Label in get otherwise is there a similar way? > Quoted answer: Yes Git has the notion of Tags for this sort of operation. I'm sure as the material unfolds that Tags

will be covered. Answer: Yes, we'll cover tags! But they have some neat properties.

11:48:21 PDT Question: So are Git Repos the equivalent of Collections in TFVC? Answer: It kind of depends as people structure projects in TFS differently as a TFS Project can be a large entity or

can be created each time for small ones. Think of a Git repository as the unit of source control that you wish to work together and maintain history of in one place. As you know that the entire history of that set of code is cloned you have to structure accordingly based on your code bases.

11:52:12 PDT Question: if I don't see the heads up display , what could be the reason? git commands work however Answer: This will be because poshgit that the guys installed earlier is not working on your machine, but Git is

working fine. Remember poshgit works though powershell if you are just in a cmd prompt.

11:56:19 PDT Question: Does git also work in powershell or do you have to be in the normal command prompt window? Answer: Either or is fine.


Q&A Log


12:17:41 PDT Question: I just created a Team Project in VSO, but I still have only the possibility to clone a Project (although there

is currently no repository on the Server!?) What do I have to choose/click in Visual Studio 2013 to add my local existing Project to a new repository? Answer: Here's a good set of instructions on how to add an existing repo to VSO:

http://blogs.msdn.com/b/visualstudioalm/archive/2013/02/06/set-up-connect-and-publish-using-visual-studio-with-git.aspx#add

12:19:42 PDT Question: Alexander K. posted: I just created a Team Project in VSO, but I still have only the possibility to clone a

Project (although there is currently no repository on the Server!?) What do I have to choose/click in Visual Studio 2013 to add my local existing Project to a new repository? > Quoted answer: Here's a good set of instructions on how to add an existing repo to VSO:

http://blogs.msdn.com/b/visualstudioalm/archive/2013/02/06/set-up-connect-and-publish-using-visual-studio-with-git.aspx#add Answer: Oops, sorry I linked to the wrong section of that post. Here's the appropriate link:

http://blogs.msdn.com/b/visualstudioalm/archive/2013/02/06/set-up-connect-and-publish-using-visual-studio-with-git.aspx#publish

12:20:17 PDT Question: @James Thanks! Are there any branching / version vizualization tools built in to the VS2013 Git support? Answer: There are branching tools for git built into VS 2013, I'm sure we'll see those later. There isn't a graphical

representation of the version history in VS, but you can still use any other git tool, e.g. gitk

12:35:00 PDT Question: @Andrew: thanks for the link, but sorry, I still don't get it. I do have a Folder on my pc called c:\DevStudio.

Here I do have several subfolders with different Projects and subprojects. If I go to "local git repositories" I can not add a repository, probably because it is not (git repository). but I also can not create a new one because I receive the message, that the Folder must be empty. what am I doing wrong? Answer: You'll need to create the repository locally, and then add the existing files to it before adding it in Visual

Studio. Open a command prompt, cd into the root of the directory and run "git init" to initialize the directory, "git add ." to add all the local files, and then "git commit -am "initial commit" " to commit them to source. After that you should be able to add that repository to Visual Studio, and then publish to VSO (or wherever)

12:42:18 PDT Question: When do we approximately start? Answer: approx. on the hour

12:43:09 PDT Question: Is this session recorded and going to be put online at after it is over? Answer: Yes, all sessions are being recorded and will be posted to MVA. We will send the URL to all attendees

when they're published in approximately 2 weeks.

12:48:25 PDT Question: @Giles: I've searched a wee bit, and it looks like my dream of a Clearcase like visualisation tool for file

version trees that allows graphical source / target merge selection is just a dream. :-/

Answer: @TedJohns: Sounds like an opportunity to contribute to the community....

12:49:37 PDT Question: Is this session recorded and going to be put online at after it is over? Answer: Yes, see the FAQ tab, but it will be recorded and attendees told when the recordings are available

12:50:43 PDT Question: or is there something like "module handling"? Answer: @Alexander This may be helpful, but there are both submodules and subtrees in git to manage "multiple"








Q&A Log


repos. http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/ I'll look through your previous

questions and see if I can help further, too

12:51:15 PDT Question: Alexander K. posted: or is there something like "module handling"? > Quoted answer: @Alexander This may be helpful, but there are both submodules and subtrees in git to manage

"multiple" repos. http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/ I'll look through your previous questions and see if I can help further, too Answer: And here's a link on submodules http://git-scm.com/book/en/Git-Tools-Submodules

12:56:42 PDT Question: Does anyone know of a good substitute 3'rd party tool or something that will substitute the 'source control

explorer'? I have tried GIT Extensions, but would like to view the source tree and history within Visual Studio, like source control explorer. Answer: @Inge Here's a great link: http://git-scm.com/downloads/guis

12:58:16 PDT Question: After reading steve answer and do some reading on the net, I think I am starting to get the image of the

Git goal - So basically, functionality speaking , if I compare it to TFS. in Git everyone has their own "local centralized server" (Which has it's own Change-sets)? which is, in some way, will become part of the big Image? Answer: Exactly. And because everyone has their own centralized server Git needs a way to uniquely identify a

change that may live in only one of those servers (new commit) or many of them (old commit). That's why it uses a hash for an Id.

12:58:57 PDT Question: After reading steve answer and do some reading on the net, I think I am starting to get the image of the

Git goal - So basically, functionality speaking , if I compare it to TFS. in Git everyone has their own "local centralized server" (Which has it's own Change-sets)? which is, in some way, will become part of the big Image? Answer: @Guy Agree with Steve St Jean, that's right. You can also check out a link to workflows with Git: http://git-

scm.com/book/en/Distributed-Git-Distributed-Workflows

13:00:08 PDT Question: > Quoted question: After reading steve answer and do some reading on the net, I think I am starting to get the image of the Git goal - So basically, functionality speaking , if I compare it to TFS. in Git everyone has their own "local centralized server" (Which has it's own Change-sets)? which is, in some way, will become part of the big Image? > Quoted answer: Exactly. And because everyone has their own centralized server Git needs a way to uniquely identify a change that may live in only one of those servers (new commit) or many of them (old commit). That's why it uses a hash for an Id. Answer: Thanks, Steve!! This is perfect

13:02:16 PDT Question: Thanks for link Sachi, any of these who snap into Visual Studio? As I have already tried GIT Extensions,

but don't fancy having it running in window outside Visual Studio. Answer: @Inge At the moment, I'm not aware of any of the 3rd party tools that work in Visual Studio as cleanly.

Does anyone else know of any?

13:03:14 PDT Question: > Quoted question: Thanks for link Sachi, any of these who snap into Visual Studio? As I have already tried GIT Extensions, but don't fancy having it running in window outside Visual Studio. > Quoted answer: @Inge At the moment, I'm not aware of any of the 3rd party tools that work in Visual Studio as cleanly. Does anyone else know of any? Answer: @Inge And I would assume this means you don't have VS 2013?

http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/

http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/

http://git-scm.com/book/en/Git-Tools-Submodules


http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows



Q&A Log


13:06:41 PDT Question: I do have VS2013, but Source Control Explorer wont work with GIT. It wont display source tree. Answer: That's correct, the source control explorer doesn't currently work with Git. You can use other tools (e.g. gitk)

alongside VS to view the repo

13:11:45 PDT Question: meaning "Source Control Explorer" working with GIT

Answer: I believe the "Its on the backlog" response applies here

13:23:08 PDT Question: What time will be getting started again? Answer: Session has restarted. Please refresh your browser.

13:23:16 PDT Question: I am starting to see how amazing tool Git is. But would the Size of a project will also affect the decision to

use git? Is git increase or decrease the effectiveness use range (When the scale is a project size) of the Agile module? Answer: Yes, the size of the repo would affect if it would be best to use Git or a centralized version control. I found

this answer on StackOverflow helpful. http://stackoverflow.com/questions/984707/what-are-the-file-limits-in-git-number-and-size

13:43:24 PDT Question: How do I get to that page? I can't access that address. Answer: Note: Pcottle doesn't work in IE. You need Chrome, Safari, Firefox or some other browser.

13:44:01 PDT Question:

> Quoted question: How do I get to that page? I can't access that address. > Quoted answer: Note: Pcottle doesn't work in IE. You need Chrome, Safari, Firefox or some other browser. Answer: @JasWard http://pcottle.github.io/learnGitBranching/

13:44:46 PDT Question: is it bad to not delete the branches when you are done? Answer: Not really. They'll only hang out locally on your machine unless you push it to another repo.

13:48:11 PDT Question: sorry what di you say? which editor is that? Answer: @Donna The display that shows up is called gitk http://git-scm.com/docs/gitk

13:50:51 PDT Question: Assuming you agree that having a "clean" history is a good thing (helpful to your audience, eliminates the

evidence of embarrassing gaffs you made), how hard is it to create a nice cleaned up history for a project in git before you push it onto the world? Answer: The difficulty isn't really a problem, but the question of what is good practice in terms of using various

commands. You can use rebase, squash, and others to have clean history with Git, but it's all dependent on how you want your history to show up.

14:12:48 PDT Question: > Quoted question: Because git is an ether that sits on top of and manages source code, how does this affect data backups of source code? In other words, how do you backup your source code and all the related git data? > Quoted answer: @ryan One way to copy is to clone your repo somewhere else. It looks like there is also a command called "git bundle" but I'm not as familiar with it. http://git-scm.com/blog/2010/03/10/bundles.html Answer: If your repo is hosted in TFS, it is backed by SQL Server so the same backup policies that work for TFVC

apply to Git as well.

http://stackoverflow.com/questions/984707/what-are-the-file-limits-in-git-number-and-size

http://stackoverflow.com/questions/984707/what-are-the-file-limits-in-git-number-and-size


http://git-scm.com/docs/gitk

http://git-scm.com/blog/2010/03/10/bundles.html


Q&A Log


14:15:58 PDT Question: I have a git repository in Visual Studio with Visual Fortran files. For various reasons, I am trying to exclude

*.F and *.f files but they still show up in Changes as new files. I put *.[fF] in the .gitignore file. Any ideas? Answer: @Matt Have you ran rm --cached? http://stackoverflow.com/questions/4308610/how-to-ignore-files-in-git

14:16:40 PDT Question: I have a git repository in Visual Studio with Visual Fortran files. For various reasons, I am trying to exclude

*.F and *.f files but they still show up in Changes as new files. I put *.[fF] in the .gitignore file. Any ideas?

Answer: But James is totally right also, try his first

14:21:01 PDT Question: So, how does change management occur? Developers make changes on local master and when finished

commit/push to "Golden Repo Master". Developers submit pending change to SCAdmin who create/update a remote repro that has a readonly branch that contains deployment packages. Do we have a distinct commit identified as the "deployed QA" release and "deployed prod" release? Perhaps on a readonly repro? And how does internal audit verify change packages? Finally, if the server explodes (disaster recovery) and we create a new server and need to deploy the most current deployed version. Is it always master on the "Golden Repo"? Answer: As the git workflow is so flexible, this is a difficult question to answer directly, without understanding your

workflow. They will be covering some of this in later sections, but here is a high-level overview of some common git workflows: http://training-course-material.com/training/Git_-_Workflow_Patterns

14:26:59 PDT Question: What is the Url for the Git Modeling tool that Steven was using? Answer: @Rayll http://pcottle.github.io/learnGitBranching/

14:27:07 PDT Question: We are running TFS 2012, when we upgrade to TFS 2013 will we be able to Branch from our existing to a

Git repo? Answer: No, you'd have to use a migration utility like git-tf to move if you wanted to take history with you.

14:28:06 PDT Question: > Quoted question: We are running TFS 2012, when we upgrade to TFS 2013 will we be able to Branch from our existing to a Git repo? > Quoted answer: No, you'd have to use a migration utility like git-tf to move if you wanted to take history with you. Answer: More details on git-tf migrations here: http://nakedalm.com/migrating-source-code-with-history-to-tfs-2012-

with-git-tf/

14:28:55 PDT Question: @Ryan @Andrew: The one (and only) advantage to shelvesets (TFVC) over a local commit (Git) is that

the shelveset pushes to the TFS host which is likely backed up by IT. A local commit is likely not, it's just on your PC. A good reason to create a public branch on the origin repo is so larger scale development efforts can be regularly pushed to the origin repo (again; assuming IT backs this up) without affecting the master branch.

Answer: A shelveset is also easier to get to if that person goes missing, but in general I agree with you

14:30:50 PDT Question: > Quoted question: Brian > Quoted question: We are running TFS 2012, when we upgrade to TFS 2013 will we be able to Branch from our

existing to a Git repo? > Quoted answer: No, you'd have to use a migration utility like git-tf to move if you wanted to take history with you. > Quoted answer: More details on git-tf migrations here: http://nakedalm.com/migrating-source-code-with-history-to-tfs-2012-with-git-tf/ Answer: An important thing to note here is that if everything is Windows based, git-tfs will probably work better than

git-tf for you. Check out: http://stackoverflow.com/questions/12866832/whats-the-difference-between-git-tf-and-git-tfs

http://stackoverflow.com/questions/4308610/how-to-ignore-files-in-git

http://training-course-material.com/training/Git_-_Workflow_Patterns


http://nakedalm.com/migrating-source-code-with-history-to-tfs-2012-with-git-tf/




http://stackoverflow.com/questions/12866832/whats-the-difference-between-git-tf-and-git-tfs


Q&A Log


14:36:14 PDT Question: can you do "git reset" to a specific commit from Visual Studio?

Answer: @Inge Don't think that there is an easy way to do it in Visual Studio You can undo changes, but not

commits.

14:38:31 PDT Question: Because git is an ether that sits on top of and manages source code, how does this affect data backups of

source code? In other words, how do you backup your source code and all the related git data? Answer: You can just copy the directory! Or push to another repo that's not on your machine!

14:39:35 PDT Question: Is this a recording? In no timezone is it currently March 11th 2014.

Answer: It's the 12th They're live.

14:39:40 PDT Question: Is there an alternative to the perforce equivalent of clientspec in git? Answer: @rash, I'm not sure. Can you spell out a bit more what clientspec does?

14:40:36 PDT Question: @Chocolatey GUI rocks (see here for list of packages) Answer: You are so right! A bit slow at times, but totally cool.

14:41:13 PDT Question: that statement alone has become 1 of the greatest reasons for git - migrate w/ all history with simple tools Answer: I know! I absolutely love having all the history in a zip file I can put in my pocket! Moving from tool to tool

has never been easier!

14:42:39 PDT Question: @Gabriel, one piece of advice I have heard it to use present tense - "change foo to integer" instead of

past or future tense. It will read better when someone is tracing through the comments. Answer: Ooh, thanks! We're going to be saying that. Note that's a practice used by the Linux kernel and most open

source projects. I like it, as it makes it easier for others to understand what they're doing with a merge.

14:47:42 PDT Question: How does git rebase handle merge conflicts? Answer: @Christian You will need to resolve merge conflicts yourself with a merge tool like KDiff3. Check out this

link about 1/4 of the way down. http://git-scm.com/docs/git-rebase

14:50:54 PDT Question: @TedJohns: The thing regarding backups is that not only am I a developer, but I also represent IT. So I'm

basically having to set up my own environment. I'm looking at Atlassian's Stash git product for source control, which would basically allow me to host my own version of BitBucket locally on my servers, and I'd like to connect Visual Studio to git repositories hosted within Stash. I'm very new to git, but think it would be valuable. I'm just trying to wrap my head around how backups would work. Locally: I suppose just backup your git directory, as @StevenBorg-NWCadence said. For server backups, I suppose Atlassian would have documentation for that. But the most important question: Does Visual Studio work with Bitbucket/Stash as the git repo? [[REPLY:]@ryan. Absolutely!! Works like a champ! Doesn't have to be in VSO, but there's tighter integration there.

14:55:54 PDT Question: link being aka.ms/gitLearnNd url Answer: Doesn't work for me in IE either.

15:01:23 PDT Question: > Quoted question: link being aka.ms/gitLearnNd

http://git-scm.com/docs/git-rebase


Q&A Log


> Quoted answer: Doesn't work for me in IE either. Answer: I think Steve mentioned it didn't work correctly in IE but Chrome/Safari would work fine.

15:06:00 PDT Question: playing with rebase in pcottle, and I was ending up with ... well strange behavior with commits. Here is

what it looks like: http://s1372.photobucket.com/user/Troy_Whorten/media/wtfgit_zpsee85140a.png.html is this a pcottle thing or would running these commands in git create the same wonked out structure? Answer: @Troy Hmm, that's a lot of commits! I think that the odd structure-look could be pcottle. I'd definitely

recommend that you do a search for rebase workflows, those may point you to a good direction.

15:06:40 PDT Question: Is there any downside to adding Get to VS even though all the mainstream projects are still in TFS? Answer: Git or TFSVC are now both first class citizens within VS and TFS. Pick TFVC if you want centralised

versions control, pick git if you want distributed. Its all down to choice and your project teams preferences.

15:08:58 PDT Question:

> Quoted question: Is there any downside to adding Get to VS even though all the mainstream projects are still in TFS? > Quoted answer: Git or TFSVC are now both first class citizens within VS and TFS. Pick TFVC if you want centralised versions control, pick git if you want distributed. Its all down to choice and your project teams preferences. Answer: I should add to that a couple of features like Code Review and Suspend don't currently work (from the My

Work hub) wih git (also gated build don't). The team at Microsoft know of these differences and will work to ensure these workflows/features are enabled over time.

15:10:13 PDT Question: > Quoted question: Is there any downside to adding Get to VS even though all the mainstream projects are still in TFS? > Quoted answer: Git or TFSVC are now both first class citizens within VS and TFS. Pick TFVC if you want centralised versions control, pick git if you want distributed. Its all down to choice and your project teams preferences. Answer: Also important to note is that the source code decision is made at the Team Project level in TFS. If you

need to move code/history between TFVC and Git you'll need to use git-tfs to accomplish this

15:12:56 PDT Question: Speaking of first class citizens, when commiting files in VS2013 / Git, does VS2013 use its code edit

window for merge conflicts (like it would for TFVC), or the merge tool the Git cmd line knows about? Answer: It will use the merge tool that you specify in Visual Studio I believe (which doesn't have to be the default

one)

15:13:03 PDT Question: Speaking of first class citizens, when commiting files in VS2013 / Git, does VS2013 use its code edit

window for merge conflicts (like it would for TFVC), or the merge tool the Git cmd line knows about? Answer: By default it will use the VS merge tool, but you can specify another if you want

15:14:08 PDT Question: Excluding changes in VS is not adding it to .gitignore, its just preventing git add for the moment, right? Answer: |Yes, that's right

15:16:42 PDT Question: @Colin When or why to choose distributed? Answer: Hopefully from todays session you can see the usage pattern differs and so one pattern may suit over

another. Both have pros and cons for a team. Hopefully todays session has helped see some of the differences to make your choice.

http://s1372.photobucket.com/user/Troy_Whorten/media/wtfgit_zpsee85140a.png.html


Q&A Log


15:21:03 PDT Question: The Microsoft ActionPack needs to have an MSDN subscription that works with VSO/TFS. This is why I'm

using Atlassian Stash. Answer: Ryan VSO comes with the ability for 5 users to use it for free. Any MSDN users you have have baked into

the benefits of MSDN the benefit to work with VSO (in addition to your 5 free users).

15:23:27 PDT Question: is there a way to do the equivalent of cloaking so that fetches only list things in paths you care about? Answer: No, not really. You can use sub-modules for this, but it isn't really the same thing.

15:23:28 PDT Question: What is you are not currently using TFS? Answer: @Sean You can also use Visual Studio Online.

15:25:50 PDT Question: i found fetches required me to pull everything even folders in repo/branch that i don't care about Answer: This is core to the git experience, you get the entire repository locally. For large code-bases this usually

means breaking into multiple repositories to manage size

15:50:35 PDT Question: How do you go back one version on the git-credential-winstore with cinst ? Answer: @Inge cuninst git-credential-winstore cinst git-credential-winstore -Version 1.2.0.0 should work!

15:52:10 PDT Question: @Andrew, so no client mapping in Git like Perforce/Source Depot? Answer: I'm not sure what you mean by this, are you talking about the ability to know about/see all client

workspaces? If so, then the answer is no, as there aren't really workspaces with git.

15:58:32 PDT Question: sent to Team: Here we go again...Steve loves this demo too much! Answer: I do! Love the Desktop demo! :-D

16:01:08 PDT Question: Can you make the work item association to commits mandatory? Answer: There isn't an option to add a check-in policy for a Git TFS project, so I think from a VS/TFS perspective no,

but you might be able to sue a Git hook to do this

16:01:54 PDT Question: > Quoted question: Can you make the work item association to commits mandatory? > Quoted answer: There isn't an option to add a check-in policy for a Git TFS project, so I think from a VS/TFS perspective no, but you might be able to sue a Git hook to do this Answer: You can also use comment templates to validate that you have used #<number> somewhere in your

commit message

16:12:25 PDT Question: Talking about the Integration-Manager Workflow Answer: @Jeff Here's more information about that workflow: http://git-scm.com/book/en/Distributed-Git-Distributed-

Workflows

16:15:45 PDT Question: Developer 3 private shows a fetch(?) from Developer 2 Public. Is that legit?

Answer: Yes, it is! totally legit!




Q&A Log


16:16:18 PDT Question: Are the suggested resources on the slides? Answer: Yes, they are in the break slides, which I BELIEVE are posted. But I haven't checked.

16:21:01 PDT Question: Any statement about files with SENSITIVE DATA (files with api-keys, connectionstrings,...) and push to

public repos (opensource Codeplex, GitHub)? Answer: @dev Something to think about is that security with git is a bit limited. Not sure if James and Steven will

mention, but check out this link: http://git-scm.com/book/ch4-1.html

16:21:57 PDT Question: With TFS, you can do gated checkins. Will that work with GIT as well? Answer: No currently. This is a feature on the backlog.

16:24:17 PDT Question: > Quoted question: Any statement about files with SENSITIVE DATA (files with api-keys, connectionstrings,...) and

push to public repos (opensource Codeplex, GitHub)? > Quoted answer: @dev Something to think about is that security with git is a bit limited. Not sure if James and Steven will mention, but check out this link: http://git-scm.com/book/ch4-1.html Answer: Worth noting if you have pushed sensitive data to a public repo you should consider this data now

compromised because of the distributed model of git.

16:33:26 PDT Question: Is there a way to cherry-pick remove/revert as well? Answer: @HGohel Not really an inverse cherry-pick, but you can take a look at interactive rebase?

16:35:43 PDT Question: Anyone care to comment on what happens to a tagged node after that node becomes unreachable

following a rebase? Answer: @Andrew I think there is a module coming up on how to retrieve commits that seem to "disappear," let us

know if that doesn't answer your question.

16:43:35 PDT Question: Anyone care to comment on what happens to a tagged node after that node becomes unreachable

following a rebase? Answer: @Andrew check out git reflog, hope this helps! http://ocpsoft.org/tutorials/git/use-reflog-and-cherry-pick-to-

restore-lost-commits/

16:45:45 PDT Question: Guys, Please don't forget a cherry-pick merge example. Answer: Hopefully the last demo covered this for you OK.

16:46:44 PDT Question: > Quoted question: Guys, Please don't forget a cherry-pick merge example. > Quoted answer: Hopefully the last demo covered this for you OK. Answer: Conflicts during the cherry-pick is just like merge/rebase conflicts.

16:50:18 PDT Question: Thanks, been using Git for 5 years on Windows, and I learned a few new things. Answer: @Don, wow! That's good news. You're the person we're afraid of in the training! :-D Since we didn't dive

into some of the more advanced topics, given time.

16:50:40 PDT Question: Thanks. Great Git tutorial. Answer: @Ben, thanks! I really appreciate it.



http://ocpsoft.org/tutorials/git/use-reflog-and-cherry-pick-to-restore-lost-commits/

http://ocpsoft.org/tutorials/git/use-reflog-and-cherry-pick-to-restore-lost-commits/


Q&A Log


16:50:42 PDT Question: sent to Team: Well done Steven & James. Great session! Answer: Thank you so much for answering all those questions!

16:51:21 PDT Question: What is the voucher code for MVA? Answer: GitVS2013

16:51:57 PDT Question: Awesome Steven and James, great delivery of content! Kanban and git are cool! Cant wait the next live

session! Answer: @Chester. Thanks! Love that you've made both! Lean Fundamentals is fun, too! Can't wait to see you

there.

16:52:17 PDT Question: Re Cherry-Pick: Any support for this in VS2013 IDE?

Answer: @TedJohns. No. None at all.

16:52:19 PDT Question: Re Cherry-Pick: Any support for this in VS2013 IDE? Answer: Not at present. You'll have to pop to the command-line or other tools for this at the moment until

incorporated.

16:52:31 PDT Question: Thank you! Very informative. Well Done! Terry

Answer: @timiesen, Thanks, Tim!

16:52:50 PDT Question: Brilliant Stuff all you guys! Nearly midnight here in the Isle of Man... I'm off to bed Answer: @Andrew, sleep well! Thanks for coming!

16:53:24 PDT Question: Great event today, thanks to everyone who made it happen!! Answer: @MobileMancer, thanks! Huge props to the production team at Microsoft. What a great group of folks! They

really made it happen!

16:53:40 PDT Question: Thank you!

Answer: @BoredGeek, you're welcome!

16:54:52 PDT Question: thank you, muy completo, felicitaciones a todos!

Answer: @Rodrigo. Thanks! (Wish I could write something in response... but I speak English and German only.)

But, in English, thanks so much for coming!!!! And thanks to Bing translate I know what you wrote! :-D

16:55:46 PDT Question: Great introduction and overview to git on windows and in VS2013. But some details where quite deep

while some basic gotchas where not mentioned. And maybe someone has an answer how to completeley purge a file from a local repo (all history). THX a lot!

Answer: @Dev. OUCH I wanted to mention that. That's something that's tough to do. Basically, it rewrites ALL

the history in your file. So if it's in a public repo, it's like a MASSIVE rebase...


Q&A Log


16:56:00 PDT Question: Wow!! Lots of info, thanks.

Answer: Paul, thanks!

16:56:12 PDT Question: Thank you ALM Wednesdays! Answer: Thank you, Gabriel!

16:56:27 PDT Question: Awesome work, Steve and James!! Answer: Thanks, @Sachi and @Andrew! You guys rocked!

16:56:38 PDT Question: Great job Steven and James! Answer: @Galong! Thanks! :-D

16:56:51 PDT Question: Congrats ! Awesome event! Answer: @Andre, thanks for the comments! :-D

16:57:09 PDT Question: 2 AM but it was worth it! have a good evening/night! Answer: @Guy, that is high praise! Thanks!

16:57:23 PDT Question: Thank you so much dear folks at MVA for such a great day! Answer: Thank you for attending!

16:57:31 PDT Question: Thank you guys, great job! Answer: @samsershameli, you're welcome! Thanks!

16:57:46 PDT Question: Thanks All! Answer: @TedJohns, you're welcome! Thanks for coming.

16:58:19 PDT Question: Thank you Steven. James Answer: @Daniel, you're welcome! Bye!!! :L-)

Using Git with Visual Studio 2013 Jump Start Q&A...

Documents

Transcript of Using Git with Visual Studio 2013 Jump Start Q&A...