Ever since Gary and I started the Git Questions video series, we've been asked to talk about merging. We're also frequently asked about rebasing - what is it, and when should I do it?
In this week's video, we take a look at how to use IntelliJ IDEA to merge a branch back into the "main" developm…