gitphpstormrebase

Rebasing a local branch from develop


I want to rebase a feature branch from develop. I am using PhpStorm Git integration and I have 2 different develop branches:

refs/remotes/origin/develop
refs/heads/develop

In order to do not mess up things, which one do I have to choose to rebase?


Solution

  • I don't know the phpstorm interface for Git, but in the command line I'd do the following:

    If there are any conflicts - resolve them. After that you can create a pull request against develop.