在GitHub中分叉我的回购叉 [英] Forking a fork of my repo in GitHub

问题描述

我在GitHub上有一个回购。有人分叉回购，并在他们的分岔中做了一些工作。我想在他们提出请求将repo回到我拥有的主repo之前，分叉他们的fork来帮助他们。问题是，当我尝试将它们分配给（我的回购）时，它不会允许我将它返回到区域。

什么是范式这通常是为了实现上面我想要做的事情吗？

解决方案

都是合作的，执行pull请求并解决合并冲突，然后，当一切顺利时，将你的分支合并到你们正在开发的开发分支中。

通常这样处理的方式是，他在
做出pull请求之前会从您那里获取，并且他会将他自己的合并冲突解决为
，他可能会知道最好，让你免去需要做
那。另一种选择是自行解决冲突。

在一个更大的项目中，会有一个人拥有这份工作，解决所有合并冲突，在公司中，这将是选择进行部署的人员。

祝你好运！

来源：技术讲座：Linus Torvalds on git

请观看源代码，因为它真的让我对使用git的协作有所了解。

I have a repo on GitHub. Someone forked that repo and is doing some work in their fork. I want to fork their fork to help them before they do a pull request to get the repo back into the main repo which I own. Problem is that when I try and fork their for (of my repo) it won't allow me to fork that back into my "area."

What is the paradigm that's typically followed to achieve what I'm trying to do above?

解决方案

I would recommend making a new branch off the branch you are both collaborating on, do the pull request and resolve merge conflicts there, then, when all is well, merge your branch into the development branch you guys are working on.

The way this is normally handled, is he would fetch from you before he does his pull requests and he would resolve his own merge conflicts as he would probably know best and this frees you up from needing to do that. Another option, is to pull and fix conflicts yourself.

In a larger project, there would be one person who has this job, to solve all merge conflicts, In companies, this would be the person selected for doing deployment.

Good luck!

Source: Tech Talk: Linus Torvalds on git

Please watch the source, as it really gave me an understanding on collaboration using git.

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