From 18eb873c2b4491a93f16438d69d0101e775267a5 Mon Sep 17 00:00:00 2001 From: fajiao <1519100073@qq.com> Date: Wed, 25 May 2022 16:35:56 +0800 Subject: [PATCH] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=20github=20=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E5=90=8C=E6=AD=A5=E5=91=BD=E4=BB=A4=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 7ba443fe..e76abb4f 100644 --- a/README.md +++ b/README.md @@ -166,3 +166,19 @@ QQ私信一般不回, 精力有限.欢迎大家在群里讨论.觉得项目对 ps: 刚增加了这个名单,肯定遗漏了一些大佬,欢迎大佬联系我添加。 +# 远程同步 +``` +git clone http://192.168.1.200/fajiao/wvp-GB28181-pro.git +cd wvp-GB28181-pro + +# 参考 https://blog.csdn.net/phpzhi/article/details/101727187 +git remote -v +git remote add upstream https://github.com/648540858/wvp-GB28181-pro.git + +git fetch upstream +git branch +git branch -r +git merge upstream/wvp-28181-2.0 + +git checkout +```