cnphpbb/deploy.stack
1
0
Fork 0
forked from DevOps/deploy.stack
Code Pull Requests Activity

Merge pull request 'fix(shell): 替换run.sh中的函数' (#2) from cnphpbb/deploy.stack:main into main

Browse Source 
Reviewed-on: DevOps/deploy.stack#2
This commit is contained in:
cnphpbb
2025-07-31 06:45:34 +08:00
parent 3468e6aaa5 b6d501fdd9
commit 649072a4ef
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
shell/run.sh
View File

@@ -1,9 +1,16 @@
#!/usr/bin/env bash
#报错:
# hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches.
#解决:
# git config pull.rebase false
updatesh() {
local dir=$1
echo "update ${dir}"
cd ${dir} && git fetch --all && git reset --hard origin/main && git pull
}
# 调用函数
updatesh $1
echo "run.sh 1"
echo "run.sh 2"
echo "run.sh 3"
echo "run.sh 4"
echo "run.sh 5"
echo "run.sh 6"
echo "run.sh 7"