Features Tutorials

Advanced GitHub Integration: Rebase My GitHub Fork

Hello guys,

We’ve already described the basic GitHub integration features on IntelliJ IDEA before. Here comes more advanced stuff.

We’ve made lots of improvements since then, but the main new thing to talk about is GitHub rebase support. GitHub provides an easy way of forking someone’s repository, however it is pretty natural for the development to keep your sources up-to-date. In the latest version of the IntelliJ GitHub plugin you can rebase your own fork onto the origin in several clicks.

Here is a small howto:

  • Let us consider that we had forked someone’s repository on the github.com, and have checked out your own fork using Checkout From the GitHub action. In this case you’ll notice a new menu item: Version Control | Git | Rebase my GitHub fork
  • In order to rebase onto the origin repository it is necessary to add it as new remote. But you’ll be prompted to add it automatically.
  • After having your origin successfully configured you’ll be able to rebase your own fork.

And yet another small but useful feature is the ability to quickly browse your code on the Internet. Open in browser is available from the context menu.

All GitHub features are available even if you have your own GitHub installation (http://fi.github.com), just configure the GitHub host in IDE settings and voila, everything works out of the box!

The next major feature scheduled is the support for github pull requests and full roadmap is available here. Do not hesitate to let us know what you think about and if you’d like any other GitHub specific functionality to be added. Enjoy using GitHub with IntelliJ GitHub integration!

And watch this short screencast demoing creating a new GitHub repository from IntelliJ IDEA project and cloning an existing one as a new project (also available at JetBrains.TV).

-Develop with pleasure!
JetBrains Team

image description