Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-22 14:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'cooker' of https://github.com/RetroDECK/RetroDECK into feat/okonomiyaki

Browse source
This commit is contained in:
XargonWan 2024-09-15 19:46:36 +09:00
parent 8c7f4a0191 821662bc45
commit 75b3552d84
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
developer_toolbox/cook_okonomiyaki.sh
View file

@ -24,7 +24,11 @@ if [[ $current_branch == feat/* && $current_branch == *okonomiyaki* ]]; then
git pull origin $branch
echo "Merging $branch into $current_branch..."
git merge origin/$branch
if ! git merge origin/$branch; then
echo "Merge conflict detected while merging $branch!"
echo "Please resolve the conflict, then run 'git merge --continue' to finish the merge."
exit 1 # Exit the script due to conflict
fi
done
else
echo "Current branch is not an okonomiyaki branch, quitting."