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

Discover more

Support for .env Files: Now Built Into PhpStorm

.env files are widely used to configure applications by storing configuration settings, environment variables, and sensitive information. This eliminates the need to hardcode these values into the application code. Previously, developers using PhpStorm had to manually install the .env Files Suppo…