updating.md

HOWTO: Updating the Template

Every now and then, but not later than the next assignment, we will update the template with new commits. In order to update your local copy follow the instructions:

1. Keep your local changes by a commit: $ git commit -a -m "short description of changes"

2. Add the project template as a new external repository ("remote") called 'template':

   $ git remote add template https://gitlab.rhrk.uni-kl.de/scivislab/scivis/template-2021.git

3. Download the new information from the remote repository 'template' via git fetch:

   $ git fetch template

4. Merge the changes from branch master in template with your own branch

   $ git merge template/master

5. Possibly, there a conflicts between your changes and the changes in template, e.g.:

   CONFLICT (content): Merge conflict in ex1/README.md
   Automatic merge failed; fix conflicts and then commit the result.

   Inside the files of concern , parts are marked where conflicts occurred. Your Version, as well as the template version, are listed consecutively.

   <<<<<<< HEAD your version
   =======
   changed version from the template >>>>>>> template/master

   You can repair the conflict by editing the file. Decide how the part in question should look like and remove the markers (<<..., ==..., >> etc.).

   Afterwards, create a new commit: $ git commit -a

The steps 1-2 have to be done only once per local copy. In order to update again, continue at step 5.