【github】Merging an upstream repository into your fork

最新推荐文章于 2023-04-19 00:21:42 发布

mandagod

最新推荐文章于 2023-04-19 00:21:42 发布

阅读量503

点赞数

CC 4.0 BY-SA版权

分类专栏： git 文章标签： github

本文链接：https://blog.youkuaiyun.com/mandagod/article/details/49834547

20 篇文章

订阅专栏

本文介绍如何在没有写入权限的情况下，从上游仓库拉取最新的更改到自己的分支中，并解决可能出现的合并冲突问题。

If you don't have push (write) access to an upstream repository, then you can pull commits from that repository into your own fork.

Open Terminal (for Mac and Linux users) or the command prompt (for Windows users).
Change the current working directory to your local project.
Check out the branch you wish to merge to. Usually, you will merge into master.
```
git checkout master
```
Pull the desired branch from the upstream repository. This method will retain the commit history without modification.
```
git pull https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git BRANCH_NAME
```
If there are conflicts, resolve them. For more information, see "Resolving a merge conflict from the command line".
Commit the merge.
Review the changes and ensure they are satisfactory.
Push the merge to your GitHub repository.
```
git push origin master
```