A `git rebase` that auto resolves conflicts in yarn.lock

git-rebase-auto-resolve-yarn-lock.zsh

rebase () {
  if [ $# -ne 0 ]; then;
    locks=$(find . -name "yarn.lock" -not -path "./node_modules/*" -not -path "*/node_modules/*" | tr '\n' ' ')

    output=$(git rebase $@) && echo $output

    if echo $output | grep 'CONFLICT' | grep -q 'yarn.lock'; then
      echo -e "\n\033[4;33mConflicts found in yarn.lock\n\033[0m\033[2;20mAuto merging\033[0m\n" \
      && git checkout $1 -- $(echo $locks) \
      && yarn install \
      && git add $(echo $locks) \
      && echo -e -n "\n\033[6;32mConflicts in yarn.lock resolved\!\n\033[0m\033[2;20mContinue with \`\033[0m" \
      && echo "git rebase --continue\`\n"
    fi
  else
    git rebase $@
  fi
}

Use like git rebase

e.g.

rebase origin/main