Difference between revisions of "Umgang mit Git"
| Line 3: | Line 3: | ||
*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 | ||
| − | <pre style="color:red">ATTENTION: before you push your code to the remote repository you need to pull and merge the two | + | <pre style="color:red">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!!</pre> |
[[GIT Background]] | [[GIT Background]] | ||
Revision as of 10:21, 22 January 2013
How to use GIT
- commit - if a part is ready 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
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!!
Git GUIs
- eclipse plugin EGIT
- TortoiseGIT
For more detailed GIT information go to: ProGit - Git Tutorial
