@@ -2,4 +2,4 @@
*.iml
__pycache__
.DS_Store
-/catboost_info/
+/catboost_info/
@@ -13,9 +13,11 @@ for file in $files; do
# 判断文件是否存在于dev分支
if git show ${dev_branch}:${file} &> /dev/null; then
# 如果文件存在于dev分支,使用git checkout命令将文件从test分支复制到dev分支
+ echo "git checkout ${test_branch} ${file}"
git checkout ${test_branch} ${file}
else
# 如果文件不存在于dev分支
+ echo "git show ${test_branch}:${file} > ${file}"
git show ${test_branch}:${file} > ${file}
git add ${file}
fi
@@ -14,6 +14,7 @@ with open(bookmarks_path, "r", encoding="utf-8") as f:
bookmarks = json.load(f)
+# test
# 提取书签的标题和网址
def extract_bookmarks(bookmarks_dict, bookmarks_list):
for item in bookmarks_dict["children"]: