Coder Intro Extra: Useful stuff

Stuff that isn't essential to know right away, but might come in handy.

Keeping your fork up to date

As the main https://github.com/NitorInc/NitoriWare repository changes, your fork will slowly become more and more out of date. At some point you're going to want to pull the latest changes across.

Your local clone will start off with only the ability to pull from "origin", your fork on GitHub. In order to pull from "upstream", the primary NitoriWare repo, you'll need to use a Git command line client (The desktop client doesn't support this yet) to add the upstream repo.

Remember that the default branch of NitorInc is develop

Within your local repo, type:

git remote add upstream https://github.com/NitorInc/NitoriWare.git

Check it worked by typing git remote -v. Now you should be able to do:

git pull upstream develop followed by git push To pull any new code from the "develop" branch of NitorInc/NitoriWare into your local repo and then push it to your fork.

This process is explained in more detail here

Managing branches

When creating a new branch for a microgame, especially after making a pull request, it's always good practice to first checkout the develop branch of your forked repository so you are not mixing code from multiple branches together.

If you've made a bunch of changes while on the wrong branch, don't panic. As long as you haven't committed any of the changes, you should just be able to checkout a new branch or switch your branch and those changes will carry themselves over. You can then commit them safely.