Skip to content

Latest commit

 

History

History
42 lines (30 loc) · 1.26 KB

README.md

File metadata and controls

42 lines (30 loc) · 1.26 KB

IPOS: Weekly sessions

Provides a complement to Blackboard sessions and in-class demonstrations, and practical activities. Sessions are updated weekly (sometimes multiple times per session).

Please note your class's sessions may be in a branch!

Recommended workflow

Note: not a general development workflow, just a useful way to work with this (constantly updating) repository.

  1. Clone this repository locally:
git clone https://github.com/NM-TAFE/<this repo>
cd civ-ipriot-in-class-demos
  1. If you want to experiment with the code locally, create a new branch:
git checkout -b local_experiments
  1. Periodically, fetch changes from the upstream repository:
git fetch origin
  1. Merge the changes from the upstream's main branch into your local branch:
git checkout local_experiments
git merge origin/main
  1. If you want to keep your local branch's history clean, you can rebase instead of merge:
git checkout local_experiments
git rebase origin/main

If there are any conflicts, you'll need to resolve them and continue the rebase using git rebase --continue.

Following this workflow lets you update your local branch with the upstream repository. Remember not to push your changes to the upstream repository.