Skip to content

xInsanityInRed/civ-ipos-sessions

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

126 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

IPOS: Weekly sessions

Provides a compliment 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 will 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/civ-ipos-sessions.git
cd civ-ipos-sessions
  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 switch 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 switch 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.

About

Provides a complement to Blackboard sessions and in class demonstrations and practical activities.

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

 
 
 

Contributors

Languages

  • Python 67.5%
  • Jupyter Notebook 19.4%
  • HTML 4.6%
  • CSS 3.7%
  • JavaScript 3.7%
  • Batchfile 0.6%
  • Makefile 0.5%