plm_admin/duckil_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auto commit

Browse Source
This commit is contained in:
bangdk 2024-11-09 09:20:59 +09:00
parent f83eaf1f5d
commit eaa417166a
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dev_git_only.sh
View File

@ -9,9 +9,25 @@ git push origin $current_branch
# 마스터 브랜치와 병합 여부 확인 # 마스터 브랜치와 병합 여부 확인
echo "You are currently on branch: $current_branch" echo "You are currently on branch: $current_branch"
echo "Would you like to merge the current branch with master? (Y/N) [Y]" echo "Would you like to merge the current branch with master? (Y/N) [Y]"
read proceed_merge
# 10초 타이머 설정
TIMEOUT=10
REPLY=""
# 카운트다운 타이머와 함께 입력 받기
while [ $TIMEOUT -gt 0 ] && [ -z "$REPLY" ]; do
echo -ne "\rWaiting for input... ($TIMEOUT seconds remaining)"
read -t 1 REPLY
((TIMEOUT--))
done
echo # 새 줄 추가
proceed_merge=${proceed_merge:-Y} proceed_merge=${proceed_merge:-Y}
echo "Selected option: $proceed_merge"
if [ "$proceed_merge" == "Y" ] || [ "$proceed_merge" == "y" ]; then if [ "$proceed_merge" == "Y" ] || [ "$proceed_merge" == "y" ]; then
# 마스터 브랜치로 전환 및 업데이트 # 마스터 브랜치로 전환 및 업데이트
git checkout master git checkout master