与 100 位贡献者合并对 github 回购做出贡献的问题
Merge issues contributing to a github repo with 100s of contributors
我尝试提交 public github 回购协议，基本上我所做的是：
- Fork the project's (Master branch)
- Made my changes and pushed to my forked repo (Master)
- Created a merge request to the original repo (Master)
回购设置为自动合并（在没有冲突和问题的情况下），但我很困惑收到以下自动提交消息：
Please read and remove:
Practically all PRs are non-mergeable because they conflict with each
other, and continually asking for rebases would be impractical.
Because of that, it is likely that your signature is added via a
commit that references and closes the PR, rather than a regular merge.
I have a supervised script that processes the patches and commits them
individually, referencing their origin PR for credit and authenticity.
In such case, you'll see said commit linked in the notification email
and in the page of the PR itself.
在我等待我的拉取请求被接受时，其他人已经做出了贡献。所以现在有合并冲突。
我应该再次拉取并重新引入我的更改吗？我应该变基吗？
... while I waited for my pull request to be accepted, others has contributed. So now there are merge conflicts. Should I pull again and re-introduce my changes?
不：至少，我认为那是原来那个家伙的意思。让我们称他为 Bob，这样我们就可以指定人类演员，然后我会解释一下以使动作更清晰（在我看来）。鲍勃说：
当我 Bob 开始查看您的拉取请求时，它可能会出现合并冲突。我不会要求您重新调整您的更改。相反，我会自己对它们大惊小怪，让它们进入。最终我会做出自己的提交，或提交，我会把你的名字放在里面，并在里面放一个 link 到你原来的 pull要求。所以进入我的存储库的内容将与您的拉取请求具有相同的效果，但实际上不会是您的提交。
should I rebase?
除非 Bob 特别要求您这样做。
我尝试提交 public github 回购协议，基本上我所做的是：
- Fork the project's (Master branch)
- Made my changes and pushed to my forked repo (Master)
- Created a merge request to the original repo (Master)
回购设置为自动合并（在没有冲突和问题的情况下），但我很困惑收到以下自动提交消息：
Please read and remove:
Practically all PRs are non-mergeable because they conflict with each other, and continually asking for rebases would be impractical.
Because of that, it is likely that your signature is added via a commit that references and closes the PR, rather than a regular merge. I have a supervised script that processes the patches and commits them individually, referencing their origin PR for credit and authenticity. In such case, you'll see said commit linked in the notification email and in the page of the PR itself.
在我等待我的拉取请求被接受时，其他人已经做出了贡献。所以现在有合并冲突。 我应该再次拉取并重新引入我的更改吗？我应该变基吗？
... while I waited for my pull request to be accepted, others has contributed. So now there are merge conflicts. Should I pull again and re-introduce my changes?
不：至少，我认为那是原来那个家伙的意思。让我们称他为 Bob，这样我们就可以指定人类演员，然后我会解释一下以使动作更清晰（在我看来）。鲍勃说：
当我 Bob 开始查看您的拉取请求时，它可能会出现合并冲突。我不会要求您重新调整您的更改。相反，我会自己对它们大惊小怪，让它们进入。最终我会做出自己的提交，或提交，我会把你的名字放在里面，并在里面放一个 link 到你原来的 pull要求。所以进入我的存储库的内容将与您的拉取请求具有相同的效果，但实际上不会是您的提交。
should I rebase?
除非 Bob 特别要求您这样做。