update

jiangxincode · jiangxincode · commit 3cf823db5436 · 2018-04-23T22:09:11.000+08:00
diff --git a/版本管理学习之路.md b/版本管理学习之路.md
@@ -123,6 +123,7 @@
 * Resolving a merge conflict on gerrit: <https://www.entropywins.wtf/blog/2013/07/01/resolving-a-merge-conflict-on-gerrit/>
 * CHERRY-PICKING SPECIFIC COMMITS FROM ANOTHER BRANCH: <https://www.devroom.io/2010/06/10/cherry-picking-specific-commits-from-another-branch/>
 * 上传图片到github wiki仓库: <https://www.jianshu.com/p/bd5c1b33d2c5>
+* git checkout --ours/--theirs: <https://git-scm.com/docs/git-checkout>
 
 ### git init 与 git init --bare
 
