Updating your repository

After some time you will certainly want to update your clone of the ThinStation repository to include the latest bugfixes. Before you start with this, you should save a copy of your build.conf and thinstation.conf.* files (or any other files you changed by intention) to a place outside the repository.

It is highly advisable to use Git for managing your local changes (e.g. on config files) instead of copying config files around.

Staying within the original branch

Let’s assume you want to stay within the ThinStation branch you initially cloned. Then enter these lines:

cd thinstation
./setup-chroot
clean_chroot
exit
git pull

This could take some time, depending on your internet connection and the activity of ThinStation development since your last update. After Git has finished you are free to reenter the chroot environment (./setup-chroot), restore your config files and continue development.

Changing to a newer branch

From time to time, a new ThinStation branch (e.g. 6.3-Stable) emerges. If you want to jump to a branch that was not a part of your original clone, you can use the following commands to do so.

git fetch origin <Branch Name>:<Branch Name>
git branch --set-upstream-to=origin/<Branch Name> <Branch Name>
git checkout <Branch Name>

For example

git fetch origin 5.5-Stable:5.5-Stable
git branch --set-upstream-to=origin/5.5-Stable 5.5-Stable
git checkout 5.5-Stable

You might also need to make sure your working area is compatible with a “factory reset”. Make sure all your changes are backed-up, then nuke your checkout like this.

cd /thinstation
rm -rf *
git checkout -f