VCS | Git | Push
The dialog box opens when pushing a branch is rejected due to lack of synchronization between your local repository and the remote storage. Use this dialog box to have PhpStorm update the local branch using rebase or merge and to configure automatic update of conflicting branches in the future.
|Update not rejected repositories as well||
The check box is available only if your project uses several repositories.
|Remember the update method choice and silently update in future||
When this check box is selected, PhpStorm saves the update method rebase or merge invoked by pressing the corresponding button
and will apply it to update the conflicting local branch silently.
After you leave the dialog box, the Auto-update if push ... rejected check box in the Git page of the Settings dialog box is selected and the applied update method becomes default. To change this setting, clear the Auto-update if push ... rejected check box.
|Merge||Click this button to have the conflicting branch updated using merge.|
|Rebase||Click this button to have the conflicting branch updated using rebase.|
- Pushing Changes to the Upstream (Git Push)
- Rebasing Branches
- Merging, Deleting, and Comparing Branches
- Version Control with PhpStorm