将其他人的更改列表合并到我的客户端中?
Merge someone else's changlist into my client?
我克隆了这个存储库:https://github.com/ipython/traitlets/tree/master/traitlets
此拉取请求正在等待被接受:
https://github.com/ipython/traitlets/pull/70
如何将它合并到我的客户端中,这样我就不必等待它被接受?
~/src: rm -rf traitlets/
~/src: git clone https://github.com/ipython/traitlets.git
Cloning into 'traitlets'...
cd taremote: Counting objects: 4005, done.
^Rceiving objects: 31% (1242/4005)
remote: Total 4005 (delta 0), reused 0 (delta 0), pack-reused 4005
Receiving objects: 100% (4005/4005), 717.15 KiB | 0 bytes/s, done.
Resolving deltas: 100% (1951/1951), done.
Checking connectivity... done.
~/src: cd traitlets/
~/src/traitlets: git remote add SylvainCorlay https://github.com/SylvainCorlay/traitlets.git
您只需在 URL:
的末尾添加“.diff”(或“.patch”)即可从 PR 获取差异
然后您可以将其应用到您的存储库中。
SylvainCorlay wants to merge 5 commits into ipython:master from SylvainCorlay:Descriptors
SylvainCorlay:Descriptors
表示分叉的GitHub用户和分支。
因此您可以简单地 git remote add SylvainCorlay https://github.com/SylvainCorlay/traitlets.git
将用户的存储库添加为远程(假设您已经拥有上游存储库的本地克隆)。然后使用 git fetch SylvainCorlay
获取它。之后您可以 git checkout SylvainCorlay/Descriptors
或在本地合并更改。
如果您没有克隆它,只需克隆表单并 git checkout Descriptors
。
我克隆了这个存储库:https://github.com/ipython/traitlets/tree/master/traitlets
此拉取请求正在等待被接受: https://github.com/ipython/traitlets/pull/70
如何将它合并到我的客户端中,这样我就不必等待它被接受?
~/src: rm -rf traitlets/
~/src: git clone https://github.com/ipython/traitlets.git
Cloning into 'traitlets'...
cd taremote: Counting objects: 4005, done.
^Rceiving objects: 31% (1242/4005)
remote: Total 4005 (delta 0), reused 0 (delta 0), pack-reused 4005
Receiving objects: 100% (4005/4005), 717.15 KiB | 0 bytes/s, done.
Resolving deltas: 100% (1951/1951), done.
Checking connectivity... done.
~/src: cd traitlets/
~/src/traitlets: git remote add SylvainCorlay https://github.com/SylvainCorlay/traitlets.git
您只需在 URL:
的末尾添加“.diff”(或“.patch”)即可从 PR 获取差异然后您可以将其应用到您的存储库中。
SylvainCorlay wants to merge 5 commits into ipython:master from SylvainCorlay:Descriptors
SylvainCorlay:Descriptors
表示分叉的GitHub用户和分支。
因此您可以简单地 git remote add SylvainCorlay https://github.com/SylvainCorlay/traitlets.git
将用户的存储库添加为远程(假设您已经拥有上游存储库的本地克隆)。然后使用 git fetch SylvainCorlay
获取它。之后您可以 git checkout SylvainCorlay/Descriptors
或在本地合并更改。
如果您没有克隆它,只需克隆表单并 git checkout Descriptors
。