PyCharm 4.0.0 Web Help

VCS | Git | Pull Changes


Use this dialog box to specify parameters for fetching changes from a remote repository and applying them to a local repository.

Item Description
Git Root From this drop-down list, select the path to the local repository which you want to refresh.
Current Branch This read-only field shows the name of the branch which is currently checked out in the selected local repository. The changes retrieved from the source remote repository will be applied to the displayed branch.

The contents of the field depend on the selection in the Git Root drop-down list.

Remote From this drop-down list, select the alias of the source remote repository.

Tip

To check that the selected alias corresponds to the correct URL address, expand the list - the URL addresses will be displayed explicitly.

Branches to Merge Use this list box to specify the branches to which you want to apply the fetched changes.
Strategy From this drop-down list, select the merge strategy. The available options are:
  • Default
  • Resolve - select this option if you need to resolve two HEADs, one of which is the current branch and the other HEAD is the branch from which you pulled changes. When this option is selected, the 3-way merge algorithm is applied.
  • Recursive - the default merge strategy for pulling one branch. Select this option if you need to resolve two HEADs by applying the 3-way merge algorithm and there are more than one common ancestor that can be used for 3-way merge.
  • Octopus - the default merge strategy for pulling more than one branch.

    Merges that require resolving conflicts manually are not performed.

  • Ours - select this option if you need to supersede old development history of side branches. By applying this strategy any number of HEADs can be resolved but the result of the merge is always the HEAD of the current branch.
  • Subtree - a modified recursive strategy.
No Commit Select this check box if you need to inspect and, if necessary, adjust the result of merging the fetched data before committing the result. The merge is performed but is not committed automatically, as if it failed.
No Fast Forward Select this check box to generate a merge commit even if the merge resolved as a fast-forward.
Squash Commit Select this check box to create a single commit on top of the current branch instead of merging one or more other branches. The working tree and index state are produced as if a real merge happened, but commit is not performed and the HEAD is not moved.
Add Log Information Select this check box to have PyCharm populate, in addition to branch names, a log message with one-line descriptions from the actual commits that are being merged.
Pull Click this button to initiate fetching changes from the specified remote repository and applying them locally according to the defined settings.

See Also

Procedures:

Web Resources: