分叉与GitHub中的分支 [英] Forking vs. Branching in GitHub

问题描述

我想了解更多关于分叉github项目与创建github项目分支的优缺点。

分叉使得我的版本该项目与原始项目更加分离，因为我无需登录原始项目的协作者列表。由于我们正在内部开发一个项目，因此将人员添加为合作者没有任何问题。但是，我们想要了解一个项目是否会使合并更改变回主项目更困难。也就是说，我想知道分支是否能让两个项目更容易同步。换句话说，当我分支时，在我的主项目版本和主项目之间合并和推送更改更容易吗？

解决方案

您不能总是创建分支或将现有分支拉回，因为您未注册为合作者

分叉只不过是GitHub服务器端的一个克隆 ：

• 无法直接推回
  
• 与 将原始Github存储库中的新更新引入分叉的Github存储库
/ a>

I'd like to know more about the advantages and disadvantages of forking a github project vs. creating a branch of a github project.

Forking makes my version of the project more isolated from the original one because I don't have to be on the collaborators list of the original project. Since we're developing a project in house, there is no problem in adding people as collaborators. But, we'd like to understand if forking a project would make merge changes back to the main project harder. That is, I wonder if branching makes keeping the two projects in sync easier. In other words, is it easier to merge and push changes between my version of the main project and the main project when I branch?

解决方案

You cannot always make a branch or pull an existing branch and push back to it, because you are not registered as a collaborator for that specific project.

Forking is nothing more than a clone on the GitHub server side:

• without the possibility to directly push back
• with fork queue feature added to manage the merge request

You keep a fork in sync with the original project by:

• adding the original project as a remote
• fetching regularly from that original project
• rebase your current development on top of the branch of interest you got updated from that fetch.

The rebase allows you to make sure your changes are straightforward (no merge conflict to handle), making your pulling request that more easy when you want the maintainer of the original project to include your patches in his project.

The goal is really to allow collaboration even though direct participation is not always possible.

---

The fact that you clone on the GitHub side means you have now two "central" repository ("central" as "visible from several collaborators).
If you can add them directly as collaborator for one project, you don't need to manage another one with a fork.

The merge experience would be about the same, but with an extra level of indirection (push first on the fork, then ask for a pull, with the risk of evolutions on the original repo making your fast-forward merges not fast-forward anymore).
That means the correct workflow is to git pull --rebase upstream (rebase your work on top of new commits from upstream), and then git push --force origin, in order to rewrite the history in such a way your own commits are always on top of the commits from the original (upstream) repo.

See also:

• Git fork is git clone?
• Pull new updates from original Github repository into forked Github repository

这篇关于分叉与GitHub中的分支的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！