Difference between revisions of "Umgang mit Git"

From SIMA wiki
Jump to: navigation, search
 
(6 intermediate revisions by 2 users not shown)
Line 1: Line 1:
−
When you right-click on one of the projects and select Team, you will get the following git context menu:
+
==How to use GIT==
−
#Commit - commit your changes
+
 
−
#Add - add a new file
+
Always consider following procedure when working with Git:
−
#Pull - get the lastet version of the repository from the remote repo on the server (pull can only be made if all your changes are either commited or stashed)
+
*commit - if a part is ready and working, commit the changes to you local repository
−
#Push - update the remote repo (you can only push if you have pulled and merged the latest version on the server)
+
*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!!
 +
<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!!
 +
After pulling you should always check if the simulation works before pushing your code!</pre>
 +
 
 +
[[GIT Background]]
 +
 
 +
[[GIT Commands]]
 +
 
 +
[[GIT Branches]]
 +
 
 +
Git GUIs
 +
*eclipse plugin [[EGIT]]
 +
*[[TortoiseGIT]]
  
 
For more detailed GIT information go to: [http://git-scm.com/book ProGit - Git Tutorial]
 
For more detailed GIT information go to: [http://git-scm.com/book ProGit - Git Tutorial]

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 Background

GIT Commands

GIT Branches

Git GUIs

For more detailed GIT information go to: ProGit - Git Tutorial

Retrieved from "http://sima.ict.tuwien.ac.at/wiki/index.php?title=Umgang_mit_Git&oldid=432"