back-merge.sh

#!/bin/bash

# https://github.com/saitho/semantic-release-backmerge/issues/43
# https://github.com/saitho/semantic-release-backmerge/issues/42
# https://codewithhugo.com/fix-git-failed-to-push-updates-were-rejected/

# $1 is base-branch

# back-merge base-branch to all feature branches: list all remote feature branches that are not a pull request
for branch in $(git branch -r --merged | grep "origin/feat/" | awk '{print $1}'| sed 's/^origin\///'); do
    git checkout $branch
    git merge origin/$1 -Xours --no-commit
    git commit -m "chore(release): 🔧 preparations for next release with a back-merge [skip ci]" --author="github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
    git push origin $branch
done