First of all, thank you for the answer, but I don’t think this is the correct way to open it. I also asked the question because I don’t want to use the above method. Let me tell you what’s wrong with the above method:
After modification, there is no need to synchronize the modifications to the original warehouse first?
When synchronizing, I directlypull吗?冲突不让拉取如何解决?(当然可以fetch再mergeor something)
I think the correct way to open it is:
forkOriginal warehouse
cloneOwn warehouse
atmaster分支添加原始仓库为远程分支git remote add upstream 远程仓库
Fork development by yourself, such asdev分支开发:git checkout -b dev
Switch the localdev分支,合并本地masterbranch and merge the localmasterbranch (already synchronized with the original repository), you may need to resolve conflicts
Submit localdev分支到自己的远程devbranch to your own remote
warehouse
pull requestNow we are sending
request to the original warehouse
Waiting for the original author’s reply (accept/reject)
1: First go to github to fork other people's repo, and then modify it 2: Then go to your space and click on the project you forked, and then click new pull request
3: Then it will jump to the original author Under the repo, the pull request interface appears. Just select the branch you want to submit. If there are files to submit, there will be a commit button below. Just fill in the description and then wait for the author to merge
First of all, thank you for the answer, but I don’t think this is the correct way to open it. I also asked the question because I don’t want to use the above method.
Let me tell you what’s wrong with the above method:
After modification, there is no need to synchronize the modifications to the original warehouse first?
When synchronizing, I directly
pull
吗?冲突不让拉取如何解决?(当然可以fetch
再merge
or something)I think the correct way to open it is:
fork
Original warehouseclone
Own warehouseat
master
分支添加原始仓库为远程分支git remote add upstream 远程仓库
Fork development by yourself, such as
dev
分支开发:git checkout -b dev
Local
dev
SubmitSwitch
master
分支,同步原始仓库:git checkout master
,git pull upstream master
Switch the local
dev
分支,合并本地master
branch and merge the localmaster
branch (already synchronized with the original repository), you may need to resolve conflictsSubmit local
warehousedev
分支到自己的远程dev
branch to your own remote
request to the original warehousepull request
Now we are sending1: First go to github to fork other people's repo, and then modify it
2: Then go to your space and click on the project you forked, and then click new pull request
3: Then it will jump to the original author Under the repo, the pull request interface appears. Just select the branch you want to submit. If there are files to submit, there will be a commit button below. Just fill in the description and then wait for the author to merge