Repo Sync: Refresh/merge your local and origin with the upstream.

repo-sync.bash

function repo-sync {
  # ######################################
  # link: https://jpapa.me/reposync
  #
  # What this does:
  #  [𝟙] Get the latest for your origin and upstream main branches'
  #  [𝟚] Make sure your main origin is in sync with your upstream and your local is pushed
  #  [𝟛] Checkout your branch and pull the latest'
  #  [𝟜] Merge main with your branch. This will sync your branch all changes in the upstream
  #
  # Where do you run this?
  #  [𝟙] Open a terminal
  #  [𝟚] Go to the folder where your local repo is
  #
  # Steps:
  #  [𝟙] Navigate to your Learn or docs repo (learn-pr, learn-m365-pr, azure-docs-pr)
  #  [𝟚] Run `repo-sync <my-branch-name>`
  #
  # Usage:
  #   Option [𝟙] Get latest for origin and upstream, and push/pull
  #     repo-sync
  #   Option [𝟚] Get latest for origin and upstream, push/pull,
  #             merge upstream master with your local and origin
  #     repo-sync my-awesome-branch
  #   Option [𝟛] Same as #𝟚, but use main branch
  #     repo-sync my-awesome-branch main
  # ######################################

  local module_branch=${1:-};
  local main_branch="${2:-master}";

  echo ''
  echo '[𝟙] Get the latest for your origin and upstream main branches'
  echo '  Running steps:'
  echo '    git checkout ' $main_branch
  echo '    git pull upstream ' $main_branch
  git checkout $main_branch
  git pull upstream $main_branch

  echo ''
  echo '[𝟚] Make sure your main origin is in sync with your upstream and your local is pushed'
  echo '  Running steps:'
  echo '    git pull'
  echo '    git push'
  git pull
  git push

  if [[ $module_branch == '' ]]
  then

    echo ''
    echo '[𝟛] No branch specified, all done'

  else
    echo ''
    echo '[𝟜] Checkout your branch and pull the latest'
    echo '  Running steps:'
    echo '    git checkout ' $module_branch
    echo '    git pull'
    git checkout $module_branch
    git pull

    echo ''
    echo '[𝟜] Merge main with your branch. This will sync your branch all changes in the upstream'
    echo '  Running steps:'
    echo '    git merge ' $main_branch
    echo '    git push'
    git merge $main_branch
    git push
  fi
}