Difference between revisions of "Umgang mit Git"
| (One intermediate revision by the same user not shown) | |||
| Line 1: | Line 1: | ||
==How to use GIT== | ==How to use GIT== | ||
| − | *commit - if a part is ready commit the changes to you local repository | + | |
| + | 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 | *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 | + | *push - if the entire task is finished and well tested you can publish your changes. Remember to pull before pushing!! |
| − | <pre style="color:red">ATTENTION: before you push your code to the remote repository you need to pull and merge the two versions locally. | + | <pre style="color:red">ATTENTION: before you push your code to the remote repository |
| − | Only if all merge conflicts are solved and the code works you can push you actual state!!</pre> | + | 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!</pre> | ||
[[GIT Background]] | [[GIT Background]] | ||
Latest revision as of 10:24, 22 January 2013
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!
Git GUIs
- eclipse plugin EGIT
- TortoiseGIT
For more detailed GIT information go to: ProGit - Git Tutorial
