From 73b9662bf41f202b036d1f4779328b60bc6904ce Mon Sep 17 00:00:00 2001 From: "zhangkun9038@dingtalk.com" Date: Mon, 19 May 2025 06:56:42 +0000 Subject: [PATCH] merge --- tools/mergeme.sh | 7 ++----- tools/mergetemp.sh | 11 +++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100755 tools/mergetemp.sh diff --git a/tools/mergeme.sh b/tools/mergeme.sh index 97d0e615..52220e36 100755 --- a/tools/mergeme.sh +++ b/tools/mergeme.sh @@ -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) diff --git a/tools/mergetemp.sh b/tools/mergetemp.sh new file mode 100755 index 00000000..7264c84d --- /dev/null +++ b/tools/mergetemp.sh @@ -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