clone original repository
git clone git@github.com:yanboyang713/personalblog.gitAdd upstream repository
- Open Emacs and use Magit to navigate to your local repository.
You can open Magit status by typing:
M-x magit-status - Once you’re in the magit-status buffer of your repository:
- Press M (Shift + m) to open the Remotes popup.
- Press a to add a new remote.
- You’ll be prompted to enter the name of the remote, typically upstream.
- Next, you’ll be asked for the URL of the upstream repository.
- Set ‘remote.pushDefault’ to “upsream”? (y or n): I choice n
- Finally, press RET (return/enter) to add the remote.
Merge upstream repository
Ensure Upstream is Added Before merging, ensure that the upstream repository is added as a remote, as explained in the previous Add upstream repository. If it’s not, add it using Magit as described earlier.
Fetching Upstream Changes
Open your repository’s magit-status by typing M-x magit-status and navigating to your repository if needed.
Press F (Shift + f) to open the Fetch popup.
Press e to fetch from a specific remote.
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff true # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.Type upstream (or whatever you named the upstream remote) and press RET (return/enter) to fetch the changes from the upstream repository.
Merging Upstream Changes
After fetching the upstream changes, merge them into your current branch.
Ensure you’re on the branch you want to merge into (usually master or main). You can switch to the desired branch by pressing b b and selecting your branch from the list.
Press m to open the Merge popup.
Press m again to merge.
You’ll be prompted to specify the branch to merge into the current branch. To merge changes from the upstream repository, type upstream/master or upstream/main (or whatever branch from upstream you wish to merge) and press RET (return/enter).
If there have been updates in the upstream repository that you fetched, this will merge them into your local branch.
Merge Conflicts
If there are merge conflicts, Magit will notify you, and you’ll need to resolve these conflicts before completing the merge.
Press e on a file in the “Unmerged” section to open the ediff merging tool, or RET to open it in the regular buffer.
Commit the resolved changes.