update

jiangxincode · jiangxincode · commit 15e027d16007 · 2018-11-04T09:35:32.000+08:00
diff --git a/J2EE学习之路.md b/J2EE学习之路.md
@@ -721,7 +721,7 @@ mvn deploy:deploy-file -DgroupId="edu.jiangxin" -DartifactId=”gcu” -Dversion
 
     Simian (Similarity Analyser) identifies duplication in Java, C#, C, C++, COBOL, Ruby, JSP, ASP, HTML, XML, Visual Basic, Groovy source code and even plain text files. In fact, simian can be used on any human readable files such as ini files, deployment descriptors, you name it.
 
-* 项目地址：<http://www.redhillconsulting.com.au/products/simian/>
+* 项目地址：<http://www.harukizaemon.com/simian/>
 * maven-simian-plugin(maven1): <http://maven.apache.org/archives/maven-1.x/plugins/simian/>
 * simian-maven-plugin(maven2+): <https://github.com/jiangxincode/simian-maven-plugin>
 * How do you use the maven-simian-plugin in Maven2?: <http://stackoverflow.com/questions/1077700/how-do-you-use-the-maven-simian-plugin-in-maven2>
@@ -1033,6 +1033,7 @@ The yFiles diagramming software components are extensive class libraries that en
 * <http://drools.org/download/download.html>
 * <http://docs.jboss.org/drools/release/6.0.1.Final/drools-docs/html_single/index.html>
 * Drools规则描述语言快速手册: <http://holbrook.github.io/2012/12/06/rule_language.html>
+* Why isn't Drools working with Java 8? <https://stackoverflow.com/questions/22493865/why-isnt-drools-working-with-java-8>
 
 ## jBPM
 
diff --git a/版本管理学习之路.md b/版本管理学习之路.md
@@ -129,6 +129,7 @@
 * 简单对比git pull和git pull --rebase的使用: <https://www.cnblogs.com/kevingrace/p/5896706.html>
 * 使用git rebase合并多次commit: <http://blog.csdn.net/yangcs2009/article/details/47166361>
 * git中将多次commit合并为一次commit: <http://blog.csdn.net/itfootball/article/details/44037181>
+* 如何合并两个Git仓库: <https://www.cnblogs.com/jiangxinnju/p/9902654.html>
 * 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/>
 * git checkout --ours/--theirs: <https://git-scm.com/docs/git-checkout>
