Skip to content Burger menu icon
Phpstorm logo

The PhpStorm Blog

The Lightning-Smart IDE for PHP Programming
Download
Features

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

JetBrains
JetBrains

After a break, Trisha Gee (Developer Advocate for IntelliJ IDEA) and I finally got back together to record another video in our Git Questions series.

In this episode, we cover one of the most frequently asked questions – Trisha explains to me the difference between merging and rebasing, when to merge and when to rebase, and explains what tools exist in all IntelliJ-based IDEs (including PhpStorm) to help you with your merging and rebasing.

We don’t cover conflict resolution in this video, but we know we have to cover it soon!

Enjoy.

newsletter
Prev post PhpStorm 2017.2 Release Candidate is availableAutorun PHPUnit Tests in PhpStorm 2017.2 Next post

Discover more

Qodana Clone Finder: Early Access Program

In December 2020, we announced the EAP for Qodana, which is rapidly evolving into a comprehensive platform that allows companies to perform multi-level evaluations of the quality of code they own, contract, or purchase. Qodana helps you detect bugs without relying on an IDE, either on a local machi…

Kateryna Shlyakhovetska Kateryna Shlyakhovetska

PhpStorm 2020.2 EAP #3

The Early Access Program for PhpStorm 2020.2 is in full swing and today we’ve got the third build of the 2020.2 EAP for you. In this blog post, you can read about improvements for Git installed in WSL2 and Search Everywhere. Download PhpStorm 2020.2 EAP (more…)…

Maxim Kolmakov Maxim Kolmakov

PhpStorm 2019.3.3 Preview

We’ve just rolled out a preview for the third minor update for PhpStorm 2019.3. Please give the PhpStorm 2019.3.3 Preview build 193.6494.5 a try and share your feedback with us. (more…)…

Roman Pronskiy Roman Pronskiy

How to Upgrade to PHP 7.4 with PhpStorm

Check out our fresh video with a few nice tips and tricks on how to update your codebase to PHP 7.4. It combines materials from the PhpStorm 2019.2 and PhpStorm 2019.3 releases, with a few cool bonuses to boot. Nikita drew our attention to the fact that setters are slower than assigning prop…

Roman Pronskiy Roman Pronskiy