Skip to content

Instantly share code, notes, and snippets.

1.合并分支中的指定文件
There have two branches A and B with the same files but a different programming interface in some files.
Now the methods of file f, which is independent of the interface differences in the two branches, were changed in branch B,
but the change is important for both branches. Thus, I need to merge just file f of branch B into file f of branch A.
git checkout <branch_A>
git checkout --patch <branch_B> <file_name>
2.合并其它分支中的文件
git checkout <branch_name> -- <paths>
[01]: /api/site/stats.json
[02]: /api/site/info.json
[03]: /api/nodes/all.json
[04]: /api/nodes/show.json?id=1
[05]: /api/topics/latest.json
[06]: /api/topics/show.json?id=1 (broken)
[07]: /api/topics/show.json?username=Livid
[08]: /api/topics/show.json?node_id=1
[09]: /api/topics/create.json (POST,未测试)
[10]: /api/replies/show.json?topic_id=1
@yang-chao
yang-chao / v2ex_api.md
Last active August 29, 2015 14:12 — forked from fanzeyi/v2ex_api.md
@yang-chao
yang-chao / README
Last active August 29, 2015 14:12
Package apks for multiple channels
打包步骤:
1. 运行python gen_flavors.py,生成channel.gradle文件(与build.gradle在同一目录下)
2. 运行Gradle tasks中的assembleRelease或者./gradlew aR