PhpStorm Rebase my Github Fork - how to avoid multiple dialog windows

Answered

If the Upstream branch has several changes and I choose VCS -> Git -> Rebase my Github Fork, I get presented with the "Files Merged With Conflicts" dialog several times. Is there a way to tell it to always "Accept Theirs" so I don't have to click "Accept Theirs" over and over again?

1 comment
Comment actions Permalink

It is not possible, unfortunately.

This can be achieved with Merge strategies, but unfortunately, there is a bug - they do not work from the UI at the moment.

https://youtrack.jetbrains.com/issue/IDEA-167816

Here is a request to add an ability to accept all theirs at once, please vote:

https://youtrack.jetbrains.com/issue/IDEA-168602

 

As a workaround, rebase with the appropriate strategy can be done via command line.

 

0

Please sign in to leave a comment.