From 975a2ef684e829a5b3815886d244301662a2d5b2 Mon Sep 17 00:00:00 2001 From: guozhanxin Date: Mon, 17 May 2021 16:09:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=8C=E5=96=84=E3=80=91file=5Fchec?= =?UTF-8?q?k.py=20=E4=B8=AD=E6=A3=80=E6=9F=A5=E5=8F=98=E6=9B=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/file_check.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/file_check.py b/tools/file_check.py index 046b2a009f..63767782b5 100644 --- a/tools/file_check.py +++ b/tools/file_check.py @@ -84,6 +84,7 @@ class CheckOut: try: os.system('git remote add rtt_repo {}'.format(self.rtt_repo)) os.system('git fetch rtt_repo') + os.system('git merge rtt_repo/{}'.format(self.rtt_branch)) os.system('git reset rtt_repo/{} --soft'.format(self.rtt_branch)) os.system('git status > git.txt') except Exception as e: