git

Ever since Gary and I started the Git Questions video series, we've been asked to talk about merging.  We're also frequently asked about rebasing - what is it, and when should I do it? In this week's video, we take a look at how to use IntelliJ IDEA to merge a branch back into the "main" development branch.  We also talk about rebasing - not only showing how to do it in the IDE, but what it means and when you should do it. We don't show how to deal with merge conflicts in this video, but they are discussed, and a more complete conflict-resolution video is definitely high on the TODO list

In this week's Git video, Gary and I look at how you can Annotate your code to see who made which changes.  We also show how you can use this information to understand a bit more about the context of a particular change.

In this week's Git questions we take a look at a simple but rather important step when you're working on a GitHub Open Source project - how do you get started? In the video, Gary and I demonstrate how to fork and clone a project (I chose some Spring example code and Gary chose a JavaScript framework) and how to set up additional remotes so that you can easily keep your fork up-to-date as per our last video. This time Gary's demonstrating the functionality in WebStorm while I stick with IntelliJ IDEA, as usual the features we demonstrate are common to all the IntelliJ Platform IDEs.

Carrying on our series of Git Questions, this week Gary Hockin (PhpStorm Advocate) and I look at the question: how do I make sure my GitHub fork is up to date when the open source project it forked has moved on? GitHub's help does, of course, cover this question. But not everyone is comfortable working from the command line, and even those who are, sometimes prefer to use the IDE if they're already working in it. This video shows an answer to this question which uses Git's fetch, pull and push from within IntelliJ IDEA.

We regularly get questions about how to achieve a particular thing - as developers there are parts of our workflow which trip us up, that our tools can help us with if we understand how.  So we've decided to start answering these real world questions with videos showing what to do. The first video features me, Trisha Gee (Developer Advocate for IntelliJ IDEA) and Gary Hockin (Developer Advocate for PhpStorm) answering the question "How do I switch branches without losing the code I was working on?". Through frequent battles with Git I have learnt there's always more than one way to do thing

A new IntellIJ IDEA 2016.3 EAP build is out and ready to try. Other than the usual amount of bugfixes, it brings a couple of noticeable improvements. More Refactorings to Java 8 First of all, we continue with tuning the inspections that help refactor regular code into idiomatic Java 8. (more…)

Hooray! Fresh IntelliJ IDEA 2016.3 EAP build is out! Among the numerous bugfixes, this build addresses one of the issues that prevented it from being used on macOS Sierra. Users of macOS Sierra, we're kindly asking you to thoroughly test this build and let us know if the problem is gone. Faster Search in Git Log The new build brings a dramatic speed improvement to searching thru Git Logs, particularly for the Text, Author and Path filters. Now, after the project has been opened (for the first time) and all the important startup tasks are completed, IntelliJ IDEA scans all reposito

As you may know in IntelliJ IDEA 2016.2 EAP we've finally fixed a very annoying issue that didn't allow to commit case-only renames in IntelliJ IDEA. For a number of reasons, the solution was not so trivial, we decided to share some of its implementation details with you. When you are on a case-sensitive file system (Linux), case-only renames are just like any other renames, so you're all good. However, when the file system you're using is case-insensitive (like Windows or Mac), some of many Git commands will treat changing the file name case as a change, while others won't. Because of that

A fresh IntelliJ IDEA 2016.2 EAP build is out and ready to test. Besides usual bugfixes it brings improvements to the Git/Mercurial Log viewer. The Log viewer now loads in the background on every change (a commit, fetch, rebase, etc). As a result, it's always ready when you open it. Also, we've reworked the way we show the loading progress. Now, when refreshing, there's a thin stripe shown under the toolbar. We hope you'll enjoy these minor improvements. If you experience any problems, feel free to file issues directly to the issue tracker. Develop with Pleasure!

Today we've released a fresh IntelliJ IDEA 2016.2 EAP build which, among other improvements, finally fixes a very annoying (and highly voted) issue with case-only renames in Git for Windows and OS X. We hope this will make your work simpler when it comes to committing case-only renames from IntelliJ IDEA. Later this week we'll also share the story behind this issue and how it was fixed, so if you're interested, stay tuned. Also, we're excited to confirm that now we officially support font ligatures (another highly voted request). This feature has been available for some time as experimental