phyer/myTestFreqAI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
zhangkun9038@dingtalk.com 2025-05-19 06:56:42 +00:00
parent 752cc2c3ca
commit 73b9662bf4
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/mergeme.sh
View File

@ -3,8 +3,5 @@
source_branch=$0
dest_branch=$1
git reset --hard
git checkout $dest_branch
git pull
git checkout $source_branch
git merge $dest_branch
cp mergetemp.sh /tmp/
/tmp/mergetemp.sh $source_branch $dest_branch $(pwd)

11
tools/mergetemp.sh Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash
source_branch=$0
dest_branch=$1
path=$3
cd $path
git reset --hard
git checkout $dest_branch
git pull
git checkout $source_branch
git merge $dest_branch