PhpStorm 6.0 Web Help

VCS | Git | Push

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.

ItemDescription
Update not rejected repositories as well
  • Select this check box to have all the local repositories updated, no matter whether push has been rejected for all of them or not.
  • When this check box is cleared, PhpStorm will update only the repositories for which push was rejected.

Note

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.

Note

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.

See Also

Concepts:

Procedures:

Reference:

External Links:

Web Resources: