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

Posted on July 13, 2017 by Gary Hockin

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.

About Gary Hockin

Gary Hockin has been creating code to power web applications for 15 years, the last three of them at an extraordinary level. He is handsome, talented, funny and articulate, and also extremely modest. Gary is a valued contributor to Zend Framework 2 and is a member of the community review team. He's married and has two wonderful children, and when he's not coding, writing about code, speaking about code or reading about code, he can usually be found in the pub playing pool.
This entry was posted in Cool Feature, Newsletter. Bookmark the permalink.