PhpStorm Rebase my Github Fork - how to avoid multiple dialog windows
已回答
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?
请先登录再写评论。
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.