0

Git Rebase in Phpstorm help

I created a new project with a new git repository. I added test.txt to the master branch, commited it and then created test_branch.

I checked out the master branch, updated test.txt and commited that change.

I checked out test_branch and tried to rebase master in test_branch.

Here were the dialog box settings:
Interactive checked
Branch: test_branch
Onto: refs/heads/test_branch
From: refs/heads/master
Default merge strategy

It never works with PHPStorm. If I run "git rebase master" on the command line, it works correctly.

Am I doing something worng in PHPStorm?

Thanks,
Aaron

4 comments

Please sign in to leave a comment.