Merge pull request #4701 from Guozhanxin/file_check

【完善】file_check.py 中检查变更文件的逻辑
2021-05-17 19:23:50 +08:00 · 2021-05-17 19:23:50 +08:00 · 2f02e35388
parent 84b2723649 975a2ef684
commit 2f02e35388
1 changed files with 1 additions and 0 deletions
--- 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: