A team game with an emphasis on movement (with no shooting), inspired by Overwatch and Zineth
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

23 lines
327 B

  1. set -v
  2. wait() {
  3. echo "Fix any merge conflicts / etc then resume by entering here: "
  4. read _
  5. }
  6. echo "This may go very wrong. Enter at your own risk."
  7. git checkout config-qwerty
  8. git merge master
  9. wait
  10. util/export-universal.sh
  11. git checkout config-installer
  12. git merge master
  13. wait
  14. util/export-installers.sh
  15. echo "Done???"