From 5828e5bb8e043645915cc10c7feed4a475a05119 Mon Sep 17 00:00:00 2001
From: lizw <1183409807@qq.com>
Date: Thu, 3 Apr 2025 11:29:57 +0800
Subject: [PATCH] 002sync_code.sh

---
 dsl/002sync_code.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dsl/002sync_code.sh b/dsl/002sync_code.sh
index f0fc7e2..ce6a1de 100644
--- a/dsl/002sync_code.sh
+++ b/dsl/002sync_code.sh
@@ -207,12 +207,12 @@ kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl
 
 echo -e "$echoPrefix cd $kls_source_path $echoSuffix"
 cd $kls_source_path
-git checkout -b main kls/main
 echo -e "$echoPrefix git checkout -b main kls/main $echoSuffix"
-git checkout main
+git checkout -b main kls/main || true
 echo -e "$echoPrefix git checkout main $echoSuffix"
-git pull kls main:main -f
+git checkout main
 echo -e "$echoPrefix git pull kls main:main -f $echoSuffix"
+git pull kls main:main -f
 
 if [ "$cmd" == "test" ];then
   echo -e "$echoPrefix git push dsl main:release/test -f $echoSuffix"