GitHub Git Merge 2013, 23 May 2013

Previous Meeting Next Meeting

⏯

youtube image

►

From YouTube: Git Merge • Git in VisualStudio (Martin Woodward)

Description

Subscribe: http://bit.ly/subgithub • Martin demos git integration with VisualStudio.

About Git Merge
Git Merge is a Git user conference held to bring together Git users and Git developers. This May, they were brought together in Berlin to improve the world of Git for everyone.

A

Hi,, my name is martin.

A

I work on the libgit2 project with some of the people here,.

A

If you want,, there's a bunch.. libgit2 use, [?] implementation of git,.

A

And there's bindings in a bunch of different languages, .net.

A

Rugged,- and there are the python ones as well,.

A

I'm not sure how advanced they are,. I haven't used them., but there you go. what I was quickly going to... So I work for a small company,.

A

Based in the pacific, northwest called microsoft.

A

We work on libgit2, but we actually build libgit2 into a product,.

A

That some people might have heard of called visual studio.

A

So this is visual studio,, but what I was going to do was quickly show you the latest, build of the git tools.

A

That are inside visual studio, if that is interesting, and show you how that works with the git command line.

A

so,. This is inside the current version of visual studio,.

A

Visual studio 2012,, I think we call it.

A

dev11- is what I know it as, and we're working on dev12.

A

Which is the next version,? It's not 2012, but anyway.

A

So this is visual studio.. If you just go to..

A

If you're a visual studio user,, you just go to tools, extensions and updates,.

A

And just search for git, and it's there, in the store.

A

But in the next version of visual studio, it'll, actually just ship.

A

In the box, with every version of visual studio, including the express editions and things,, it will just be there.

A

If you go to "new project",, let's do a "console application".

A

Check the "add to source control" box, there you go, hit "ok".

A

And then we are microsoft,, so we have to ask you a million questions., so we'll come in here, and we'll say: "we want git," and we'll check the "never. Ask me that question again" box please., so we'll do that, hit "ok".

A

and you just work. and things fairly stay out of your way. If you want to.

A

So I can just come in here, "hello world," there we go.

A

So this is c# if you've never seen it before,.

A

It looks awfully like java, I guess, but there you go.

A

There we are. and if you notice,, if you're a visual studio, user,.

A

This is just visual studio to you,, but if you notice here there are some little "+" icons.

A

Anybody use visual studio here by the way,, I'm just interested?.

A

Yeah,, a couple,, a few. yeah okay., so this is just some little "+" icons here,, and that shows you.

A

It's being tracked by version control, there you go.

A

So if I can right-click here and say "commit" and it brings up.

A

The commit view here and I can obviously just say.

A

"Initial commit," hit commit, and that's committed into my repo,.

A

Great. into my local repo, obviously.

A

So that's fairly interesting,, but what if you wanted to do.

A

Something a bit more special. like. Maybe you want to go and...

A

Let's do a new branch,, because you know I like to do feature branches., so we'll say: "new, branch" and we'll do "feature, a" and we'll create the branch,.

A

And then that's created the branch for me, and I've checked out and created the branch for me.

A

So now I can come here and just "work on feature a",.

A

We'll just commit that. so changes,, let's just say:.

A

Work in feature a, there we go.

A

Now the idea is that it's just all the basic stuff you'd need as a dev commit, push, pull,, clone, merge.

A

If you want to easily check out to different branches,.

A

You can just come in here and easily just check, out, and notice. It just updates inside of visual studios,.

A

So there we go, it's saying: "hello world",.

A

If I go back here and go to feature a,, it just instantly updates inside of the ide,, you don't get asked a million questions and popups and all that sort of stuff. it just works., because we want to.... The key is that we make the good things about git shine through.

A

In the development environment., but you don't have to just be in the ide as well.

A

If you're sane, and you like to live in command, line,.

A

Then you can actually just be in the command line,.

A

So let's go to, there. We go.

A

So I am in here, and then maybe I do "notepad .\readme.txt",.

A

Before I do that, actually,, let's just.., so I am.

A

Currently in the master branch,, but if I do "git checkout..".

A

Yes? (inaudible).

A

It's hidden sorry,. Now what is the..? Yes, it's just because..

A

Well, the git actually,! So if I do, now, this is.

A

"1S -force" there we go.

A

It's just git,. It's not... there, you go.

A

So now, if I do a "git checkout b from command", so there we go.

A

I've created a new branch,, created it from the command line, and obviously stretched it. notice. Here, visual studio is already switched to it for me.. I didn't have to come in and hit "refresh"..

A

It stays connected to the command line.

A

So you can easily, seamlessly switch back and forth to the.

A

Command line, if you're more familiar with that.

A

so say I come in and do: "readme.txt",, I better not.

A

Use [vy?] that won't work in this shell will it.

A

There we go notepad,, oh no,, that's not what I want to do, hang on a second.

A

A

A

A

There we go, duh-duh-duh buh-buh-buh., so now,. If you do git's status,, you can see it's detected, it,.

A

But I haven't added it yet., the equivalent of that inside visual studio here,. Is you see, there's this little.

A

Untrack files thing.

A

I've- I click on here. We can actually see that readme.txt.

A

Is untracked,, it shows you that it's there..

A

If you want to,, you could just right-click and say "add", to add it into your index., but I might come down here,.

A

And say: "git add readme.txt",.

A

Oh there we go, and it's got colf formatting,. That's interesting.

A

I seem to have set it to lf, that'll be exciting., so there we go,, readme.txt, and notice here that it is.

A

Now in my index and then I can just commit that there,.

A

Or if I want to, I can just say: "git commit", there you go,.

A

And then that is done. blah blah blah.

A

and then you go over and you can obviously just right-click on the file, "source control", "view history",.

A

See all of your commits, that's not particularly interesting history.. Let's switch over...

A

No,, what did I want to do? if I quickly... the other thing, I wanted to quickly show you,.

A

If we make a conflicting edit,, so if we go to master, and we've got "hello world", and then we go here, so from command, we've got that one,. So let's make a quick "in from (command)".

A

We'll save that, and we will add it,.

A

So, "change 1", hit commit.

A

A

jump over to master, ""hello world" in master".

A

A

A

right. So now I've done two changes: one over from command, one over here in master,.

A

If I obviously try and now merge.

A

So if I go to "branches"- and I say "merge from command into master",.

A

Hit the "merge" button, I'm going to get a conflict,.

A

The thing is, it tries again to be very git-ty and keep out.

A

Of your face,, so you can carry on working if you want to.

A

But you say here: "resolve the conflicts", and you say: there, "I've got a conflict,. What do I want to do?"? I can hit a bunch of options, or I can go press the "merge" button,.

A

And use the graphical, tool, and say,, you know what,, I quite like that,, but actually, "from command and vs".

A

And then accept merge, and yes, I want to normalize.

A

My linings, because I messed it up. and then I can go to my commit, merge and actually merge it in as a commit.

A

and notice. It's already brought in the readme.txt,, because that wasn't in a conflict.

A

So there we go., so that's git, built inside a visual studio.

A

Using the power of libgit2.

A

And if you've not looked at the libgit2 project, yet, go and take a look at that., always open for contributions..

A

Okay,, thank you very much..