PhpStorm

The IDE that empowers PHP developers

Download

Features Releases

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

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.

PhpStorm 2017.2 Release Candidate is available Autorun PHPUnit Tests in PhpStorm 2017.2

image description

Discover more

PhpStorm 2024.3

Support for PHP 8.4, xdebug_notify(), Pest 3.0, and Pest parallel and mutation testing, new features in JetBrains AI Assistant, and more!

PhpStorm 2024.2

Log files support, auto-completion in the new terminal for Laravel, Symfony, WordPress, and Composer, editing from a floating toolbar, and more!

What’s New in PhpStorm 2024.1

Explore new features of PhpStorm 2024.1: local AI code completion, Symfony’s AssetMapper support, and more.

PhpStorm 2023.3

Explore the new features in PhpStorm 2023.3: support for PHP 8.3, the Pest test framework, improvements for Symfony projects and AI Assistant.