Update Instructions

Every so often, FIRST releases a new version of the FTC SDK. When that happens, here's how to update this repo while maintaining a clean git history:

# WARNING: As always with git, proceed with caution and make lots of backups.
# WARNING: During this process, you may need to resolve some merge conflicts.
# IMPORTANT: This script updates master. You should change it if you want to
# 			 update a different branch.

git remote add ftc_app https://github.com/ftctechnh/ftc_app
git fetch ftc_app
git checkout --orphan tmp/update-ftc-sdk ftc_app/master
git commit -am "chore: clone from FTC SDK" -m "$(git log -1 ftc_app/master)"
git checkout -b update-sdk master
# WARNING: This command is likely to need human input to resolve merge conflicts
git rebase --onto tmp/update-ftc-sdk "$(git rev-list --max-parents=0 HEAD)" update-sdk
git remote rm ftc_app
git branch -D tmp/update-ftc-sdk
git push -u origin update-sdk

# Now you can submit a PR!
# Once your PR lands, make sure to create a Github release!

One your PR is merged, update each team repo with the update.sh script.

If this doesn't work, contact @ariporad.