Features Releases

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

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!


image description