代码之家 › 专栏 › 技术社区 › Julian

GitHub:抱歉,此差异不可用(fork已删除)

pull-request github git

2

Julian · 技术社区 · 7 年前

我试着合并 this pull request 但是叉子已经拆了。

Github在PR的底部显示命令行:

但是 curl -L https://github.com/304NotModified/Fody.Stamp/pull/22.patch | git am -3 不起作用。

我发现了 https://patch-diff.githubusercontent.com/raw/304NotModified/Fody.Stamp/pull/22.diff

你知道如何(在本地)得到改变吗?

1 回复 | 直到 7 年前

1

3

torek 7 年前

不幸的是,GitHub不会再像这样向您展示差异了。

幸运的是,原来的是仍然连接到上游存储库:

$ git clone git://github.com/304NotModified/Fody.Stamp
Cloning into 'Fody.Stamp'...
remote: Counting objects: 1102, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 1102 (delta 0), reused 0 (delta 0), pack-reused 1100
Receiving objects: 100% (1102/1102), 2.07 MiB | 3.10 MiB/s, done.
Resolving deltas: 100% (718/718), done.
$ cd Fody.Stamp

下一部分是真正的诀窍:

$ git fetch origin refs/pull/22/head:refs/heads/pr22
remote: Counting objects: 42, done.
remote: Total 42 (delta 27), reused 27 (delta 27), pack-reused 15
Unpacking objects: 100% (42/42), done.
From git://github.com/304NotModified/Fody.Stamp
 * [new ref]         refs/pull/22/head -> pr22

只要你有命令行Git,你就可以这样工作。它是 更好的 ,因为您有原始提交,因此可以使用 git cherry-pick git merge (带或不带) --squash git rebase 复制它们,或者别的什么。

$ git log --decorate --oneline --graph master pr22
*   950ecea (HEAD -> master, origin/master, origin/HEAD) Merge pull request #47 from 304NotModified/fix-unstable-test
|\  
| * fb12f67 fix unstable test
* |   401e787 (tag: 1.4.2) Merge pull request #45 from 304NotModified/fix-dependency

[mass snippage]

* 3e6ddf0 Update README.md
*   73e9e51 Merge pull request #25 from 304NotModified/patch-1
|\  
| * c1cad0b Syntax highlighting
* | 0e3dac1 (tag: 1.3.1) mark as  (no longer maintained)
* | 18f6705 Update README.md
* | 1382fa8 (tag: 1.3.0) update cecil
|/  
| * ac637e3 (pr22) Update README
| * 0f51ff7 Add tests for UseFileVersion and OverwriteFileVersion
| * 5d2517f Refactor and fix tests
| * 449db14 Add OverwriteFileVersion in config (default true)
| * 8be5aa1 Use AssemblyFileVersion to format AssemblyInformationalVersion if UseFileVersion is true
| * 26c6fdd Add Configuration.UseAssemblyFileVersion
| * 58635c2 Refactor a little
| * 4bf8d6a Add more tokens to README
|/  
* 5e64e14 bump refs