GitHub Git Merge 2013, 7 Jun 2013

Previous Meeting Next Meeting

⏯

youtube image

►

From YouTube: Git Merge • Git integration with Intellij (Kirill Likhodedov)

Description

Subscribe: http://bit.ly/subgithub • Kirill demonstrates Intellij IDEA's git integration.

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

A

Okay. hello. hello, everybody., my name's kirill.. I work at jetbrains company,.

A

And intellij idea, project.

A

And,, if you program in java,, you probably know intellij idea.,.

A

Who? Actually programs in java, here? anybody? yeah? (laughter).

A

Some of you?, we also have products for ruby, for python,, for phpstorm,.

A

And for webstorm,, and all of them are very nice ides for these languages.

A

Some of them are considered best in the market..

A

Actually, my work is to support integration with git and other.

A

Version controls in this ide. I'm going to show you just.

A

A couple of features that we made to make life of people.

A

A bit easier., let me make it a bit: larger. okay., no?, yeah.,.

A

So, imagine that we want to make some changes in git.

A

And push it., so we just do something, push, bam, push was.

A

Rejected,, so we actually have to pull and push again.

A

Now it succeeds. in the ide we have implemented a very nice.

A

Feature. so,: let's make some changes.

A

Now we push. here is the push dialogue.. We just press.

A

We can review our changes, what we made.

A

We push, and actually intellij idea...that push was rejected.

A

And it proposes to update immediately., we can rebase.

A

With just one click,, which is interesting in that you can see that.

A

File b is modified, and if you would call rebase in the command line,.

A

It would blame that you have something like uncommitted.

A

Changes and it won't allow you to rebase,, so we silently.

A

Make a stash-unstash., so we stash before rebase, and we unstash.

A

After it., we also have this nice checkbox,, and some people.

A

Who just work with some usual workflow on one branch,.

A

Pulls and pushes, he may want to check this checkbox.

A

And just push silently without caring about updates.

A

So, we rebase. it stashes changes from b,, then it rebases and.

A

Pushes our changes and un-stashes changes for b that.

A

They're here., just a couple of days ago, I saw a tweet from.

A

Some person who said, "oh,, I really like how intellij makes".

A

"Push, fail, stash,, fetch,, rebase, and unstash in one single click.".

A

Another feature that I wanted to show you is how we work.

A

With branches., so we have this nice branch control.

A

I have only one branch now.. I am on master.

A

So we can create new branch., create feature. okay,.

A

Let's add some feature: here.

A

Okay, now we can go back to master, and interesting thing.

A

That happens if we make some local changes here, and now.

A

We want to checkout back to feature..

A

Git itself won't allow us to do it..

A

It would complain that our changes would be overwritten by checkout.

A

We capture this information, and we propose this so-called "smart checkout.".

A

Smart checkout is actually, again,, stash, changes,, checkout, and un-stash.

A

Changes., so this our new feature, and this, our local changes.

A

This is very handy when you, for example, forgot to switch.

A

Branches before you make some local changes.

A

now you just can switch like this. actually,. Our git integration is rather.

A

Mature project,, but for a long time, the purpose was just to make.

A

Some many functions, and some functions of this looks.

A

Like this. for example, here is rebase dialogue.. It is actually-- wow--not, very useful,, because it is just a mirror of command-line.

A

Options in the graphical user interfaces. so for the last.

A

Two years we are trying hard to make the ui as friendly to.

A

Our users as possible, with this automated workflows and with.

A

These nice widgets to work with branches and so on.

A

Actually,, that's all I wanted to show you, some advertisement.

A

For our product., I also want to notice that intellij idea.

A

Community edition,, which is a full-featured java, ide,.

A

Is open-source and free, and it is on github. if you program.

A

Java and if you want to participate in this project,, we can.

A

Work for it tomorrow.. I will prepare some rather simple bug. Reports.

A

Which are waiting to be fixed., there are more than 600 of bug, reports,.

A

So there are plenty of work for us. so, guys,. Please find me,.

A

And we can hack together. thank you.

A