解决冲突

3.git clone --depth=1后拉取其他分支的方法

git clone -b feat/#pro#9534/同步平台状态新 --single-branch https://gitlab.starmerx.com/pro/seller_center_be.git --depth=1

git remote set-branches origin 'master'

git fetch --depth 1 origin master

git checkout master

 

git remote set-branches origin 'test/relaese/202405'

git fetch --depth 1 origin test/relaese/202405

git checkout test/relaese/202405