Compare commits
3 Commits
73e527640f
...
d916637798
| Author | SHA1 | Date | |
|---|---|---|---|
| d916637798 | |||
| 71d236d0ba | |||
| d81c424878 |
@@ -568,8 +568,11 @@
|
||||
dev_exists="$?"
|
||||
if [[ "$dev_exists" == 0 ]]; then
|
||||
git switch dev
|
||||
else
|
||||
elif [[ "$dev_exists" == 2 ]]; then
|
||||
git switch main
|
||||
else
|
||||
echo "ERROR: Unknown status for dev_exists, '$dev_exists'."
|
||||
continue
|
||||
fi
|
||||
git pull
|
||||
git push
|
||||
@@ -893,10 +896,13 @@
|
||||
function load-branch {
|
||||
rcvr="$1" # branch which we want to modify
|
||||
base="$2" # branch with the changes we want
|
||||
if [[ "$1" == main ]]; then
|
||||
if [[ "$rcvr" == main ]]; then
|
||||
echo "Are you nuts, fool!? Not main! Do it manually!"
|
||||
exit 1
|
||||
fi
|
||||
if [[ -z "$base" ]]; then
|
||||
base="dev"
|
||||
fi
|
||||
git switch "$base"
|
||||
git branch -f "$rcvr" "$base"
|
||||
#git switch "$rcvr"
|
||||
@@ -904,8 +910,11 @@
|
||||
#git switch "$base"
|
||||
git branch
|
||||
}
|
||||
alias load-prod="load-branch prod dev"
|
||||
alias load-stage="load-branch stage dev"
|
||||
alias load-prod="load-branch prod"
|
||||
alias load-stage="load-branch stage"
|
||||
alias rollback-prod="load-branch prod main"
|
||||
alias rollback-stage="load-branch stage main"
|
||||
alias rollback-dev="load-branch dev main"
|
||||
|
||||
- name: General | Account Management | Users | Files | Common Variable
|
||||
set_fact:
|
||||
|
||||
Reference in New Issue
Block a user