4 Replies Last post: Feb 26, 2013 11:29 PM by Aaron Sturm  
Aaron Sturm Newbie 3 posts since
Nov 28, 2012
Currently Being Moderated

Feb 24, 2013 3:25 AM

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

Kirill Likhodedov JetBrains 238 posts since
Jun 11, 2010
Currently Being Moderated
Feb 25, 2013 4:45 PM in response to: Aaron Sturm
Re: Git Rebase in Phpstorm help

The equivalent for "git rebase master" will be the following dialog setup:

 

Interactive not checked (if you check "interactive", it will be "git rebase -i master").

Branch: test_branch

Onto: refs/heads/master

From: empty

Default merge strategy

Kirill Likhodedov JetBrains 238 posts since
Jun 11, 2010
Currently Being Moderated
Feb 26, 2013 6:03 PM in response to: Aaron Sturm
Re: Git Rebase in Phpstorm help

–°ould you please attach a screenshot illustrating the problem?

More Like This

  • Retrieving data ...