合并参考地址
https://www.cnblogs.com/lfzm/p/10681412.html
处理冲突正则
- 匹配冲突后的内容
=======(?:\r|\n|.)+?(chequan-dev-v1\.1\.4)(?:\r|\n|.)|<<<<<<<\sHEAD(?:\r|\n|.)
- 匹配冲突前的内容
<<<<<<< HEAD(?:\r|\n|.)+?=======(?:\r|\n|.)|>>>>>>>\schequan-dev-v1\.1\.4(?:\r|\n|.)
https://www.cnblogs.com/lfzm/p/10681412.html
=======(?:\r|\n|.)+?(chequan-dev-v1\.1\.4)(?:\r|\n|.)|<<<<<<<\sHEAD(?:\r|\n|.)
<<<<<<< HEAD(?:\r|\n|.)+?=======(?:\r|\n|.)|>>>>>>>\schequan-dev-v1\.1\.4(?:\r|\n|.)