[Sync master (main) / develop branches in git]

sync-branches.sh

# NOTE: THE FOLLOWING IS FOR *NON-FORKED* REPOS ONLY.
#       "origin" WILL REFER TO THE *MAIN* REPO, NOT A FORK.
#       AND THERE IS NO "upstream".

# Prep...
git fetch origin

# DEVELOP
git checkout develop
git pull --rebase origin develop # (1.) pull in latest changes from remote "develop"
git merge origin/master          # (2.) merge in latest changes from remote "master" (ideally this is nothing, unless there were hotfixes on master recently)
git push origin develop          # (3.) push changes to remote "develop"
 
# MASTER
git checkout master
git pull --rebase origin master # (1.) pull in latest changes from remote "master"
git merge develop               # (2.) pull in latest changes from "develop" (note that by now this will include all changes from remote "develop" AND remote "master" due to running above steps)
git push origin master          # (3.) push changes to remote "master"