This commit is contained in:
Adam Wilson
2025-08-20 09:53:32 -06:00
parent 22bcc8e598
commit b6c7e96c81
+16
View File
@@ -0,0 +1,16 @@
git fetch --all && git branch -r | grep 'origin/auto-generated-' | sed 's/origin\///' | xargs -I {} sh -c 'git show-ref --verify --quiet refs/heads/{} || git checkout -b {} origin/{}'
git checkout development
git pull origin development
# Merge all auto generated branches to dev
git branch -r | grep 'origin/auto-generated-' | sed 's/origin\///' | while read branch; do
echo "Merging $branch..."
git merge origin/$branch
if [ $? -ne 0 ]; then
echo "Merge conflict in $branch"
exit 1
fi
done
git push origin development