Umgang mit Git
From SIMA wiki
How to use GIT
Always consider following procedure when working with Git:
- commit - if a part is ready and working, commit the changes to you local repository
- pull - pull as often as possible. If the code of you local repository is far away from the remote repository a merge could be difficult
- push - if the entire task is finished and well tested you can publish your changes. Remember to pull before pushing!!
ATTENTION: before you push your code to the remote repository you need to pull and merge the two versions locally. Only if all merge conflicts are solved and the code works you can push you actual state!! After pulling you should always check if the simulation works before pushing your code!
For more detailed GIT information go to: ProGit - Git Tutorial