Tag Archives: Git

Git Questions – How and When do I Merge or Rebase?

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 … Continue reading

Posted in Tips & Tricks | Tagged , | 12 Comments

Git Questions: How do I see who made certain changes?

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 … Continue reading

Posted in Tips & Tricks | Tagged , , | Leave a comment

Git Questions – How to get started with a GitHub project

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 … Continue reading

Posted in Tips & Tricks | Tagged , , , , | 1 Comment

Git Questions – How to Keep a Git Fork up to Date

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? … Continue reading

Posted in Tips & Tricks | Tagged , , , | 5 Comments

Git Questions – How do I switch branches without losing my work?

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 … Continue reading

Posted in Tips & Tricks | Tagged , , , | 13 Comments

Fresh EAP with Refactorings to Java 8, Better VCS and Gradle Integrations

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 … Continue reading

Posted in EAP Releases, New Features | Tagged , , , , , , | 12 Comments

IntelliJ IDEA 2016.3 EAP: Faster Git Log, Parameter Hints and 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 … Continue reading

Posted in EAP Releases, New Features | Tagged , , , , , , , | 30 Comments

How to Support Case-only Rename in Git

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 … Continue reading

Posted in New Features | Tagged , | 11 Comments

IntelliJ IDEA 2016.2 EAP Improves Log for Git and Mercurial

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 … Continue reading

Posted in EAP Releases, New Features | Tagged , , , , | 2 Comments

IntelliJ IDEA 2016.2 EAP: Case-Only Renames in Git, Ligatures, Background Images, and More

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 … Continue reading

Posted in EAP Releases, New Features | Tagged , , , , | 13 Comments