From b6c7e96c8144982b50b18239d11e1109675d631d Mon Sep 17 00:00:00 2001 From: Adam Wilson Date: Wed, 20 Aug 2025 09:53:32 -0600 Subject: [PATCH] script --- git_remotes_update.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 git_remotes_update.sh diff --git a/git_remotes_update.sh b/git_remotes_update.sh new file mode 100755 index 000000000..b8d3d63f4 --- /dev/null +++ b/git_remotes_update.sh @@ -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 \ No newline at end of file