origin
). --rebase
: after fetching the changes from a remote branch, PyCharm will rebase them onto the current branch instead of merging them. --ff-only
: the merge will be resolved only if it is possible to fast-forward. --no-ff
: a merge commit will be created in all cases, even if the merge could be resolved as a fast-forward. --squash
: a single commit with all pulled changes will be created on top of the current branch. --no-commit
: a merge will be performed, but a merge commit will not be created so that you can inspect the result of the merge before committing. pull
options. git submodule update
, which will check out the commit referenced in the root repository. This means an update will only be performed if the submodule reference changes in the root repo, or if a new submodule is added. git fetch
and then git merge
, or git pull --no-rebase
. git fetch
and then git rebase
, or git pull --rebase
(all local commits will be put on top of the updated upstream head).