Pull Changesλ︎
Commits can be pulled or fetched from remote repositories.
SPC g s to open Magit Status buffer
F to open the pull menu
u to pull from the upstream remote repository. If this is not currently set, then a prompt appears to select the default upstream.
Use e to pull from a different repository.
Hint::Ensure you are on the correct local branchλ︎
The current local branch is shown at the top of the Magit Status buffer.
b bdisplays a popup to select a different branch if you are not on the correct branch to pull changes into.
Rebase when pullλ︎
SPC g s to open Magit Status buffer
F to open the pull menu
r rebase changes that are not on the remote repository.
u to pull from the upstream remote repository. If this is not currently set, then a prompt appears to select the default upstream.
Rebase local commitsλ︎
SPC g s to open Magit Status buffer
F to open the pull menu
-r rebase local changes that are not on the remote repository.
u to pull from the upstream remote repository. If this is not currently set, then a prompt appears to select the default upstream.
If there are conflicts between the commits on the remote and local repositories then use the ediff tool or edit the files and delete the conflict markers and resolve conflicting text change. Save the change and r to resume the rebase.