Show last authors
| author | version | line-number | content |
|---|---|---|---|
| 1 | We use [[Git>>url:http://git-scm.com/||shape="rect"]] to manage our source code. Our [[Gitorious>>url:http://git.rtsys.informatik.uni-kiel.de/||shape="rect"]] installation is the front end we use to manage our different Git repositories. | ||
| 2 | |||
| 3 | This page will help you get started with Git and getting the KIELER sources. For more detailed information, see [[Git's official documentation>>url:http://git-scm.com/documentation||shape="rect"]]. The [[SVN Crash Course>>url:http://git-scm.com/course/svn.html||shape="rect"]] is probably a good place to start. For more in-depth information, see the [[Git Community Book>>url:http://book.git-scm.com/||shape="rect"]] or the [[Pro Git>>url:http://progit.org/book/||shape="rect"]] book. Furthermore, each office has a copy of another excellent book about Git, so you might as well go ahead and read it. This will help ease you in to some of the more advanced concepts of Git, which are a little hard to understand at first. If everything else fails, Miro and Tim will be more than happy to help you with Git and rant about how excellent of a system it is. For more information on Git Eclipse integration, see the [[EGit User's Guide>>url:http://wiki.eclipse.org/EGit/User_Guide||shape="rect"]]. | ||
| 4 | |||
| 5 | **Content** | ||
| 6 | |||
| 7 | |||
| 8 | |||
| 9 | {{toc/}} | ||
| 10 | |||
| 11 | = Checking Out KIELER = | ||
| 12 | |||
| 13 | KIELER is essentially a large heap of Eclipse plug-ins that aren't easy to find your way through as a new developer. The [[doc:Overview]] page has a nice overview of our sub-projects and what plug-ins belong where. This section will tell you how to get the KIELER sources. As for what plug-ins you will actually need to checkout, ask your advisor. | ||
| 14 | |||
| 15 | {{info title="Important Hint for Users Behind Firewalls"}} | ||
| 16 | The Git protocol runs on port 9418, and SSH runs on port 22. HTTP transfer is also possible in read-only mode, but is not recommended due to its bad performance. | ||
| 17 | {{/info}} | ||
| 18 | |||
| 19 | You essentially have the choice of either checking out the KIELER sources using our project sets (preconfigured sets of plug-ins that are automatically imported into your Eclipse environment), or by selecting the plug-ins you want manually. | ||
| 20 | |||
| 21 | == Checkout Using Team Project Sets == | ||
| 22 | |||
| 23 | If you need a specific subset of the KIELER plugins, select a suitable project set, copy its URL, and select //File - Import - Team - Team Project Set//. There are two versions of the project sets: | ||
| 24 | |||
| 25 | * [[Project sets for the Git protocol>>url:http://rtsys.informatik.uni-kiel.de/%7Ekieler/projectsets/git/||shape="rect"]] (read-only; don't take these if you'll be actively developing KIELER code) | ||
| 26 | * [[Project sets for the SSH protocol>>url:http://rtsys.informatik.uni-kiel.de/%7Ekieler/projectsets/git-ssh/||shape="rect"]] | ||
| 27 | |||
| 28 | For access using the SSH protocol you first need to do steps 1 to 3 of the //manual checkout// section below. | ||
| 29 | |||
| 30 | == Manual Checkout == | ||
| 31 | |||
| 32 | In case you only need read access, omit steps 1 to 4 and copy the following URI instead: | ||
| 33 | |||
| 34 | {{{ git://git.rtsys.informatik.uni-kiel.de/kieler/mainline.git}}} | ||
| 35 | |||
| 36 | Otherwise, follow these steps: | ||
| 37 | |||
| 38 | 1. If you don't have an SSH key yet, you have to create one. You can do this by: | ||
| 39 | 1*. Creating one using the command ssh-keygen on the command line. Simply type ssh-keygen, confirm the default destination file ~~/.ssh/id_rsa, and choose whether to give a passphrase. If you have a passphrase, you need to enter it whenever you use your SSH key for the first time in a session. You can omit the passphrase, but that makes the key less secure. As result, the tool generates a private key ~~/.ssh/id_rsa, which has to be kept secret, and a public key ~~/.ssh/id_rsa.pub. | ||
| 40 | 1*. Using eclipse to generate it. You can find this function under //Preferences - General - Network Connections - SSH2 - Key Management//. | ||
| 41 | 1. Register with [[Gitorious>>url:http://git.rtsys.informatik.uni-kiel.de||shape="rect"]] and upload your public SSH key (//Dashboard - Manage SSH keys - Add SSH key//). | ||
| 42 | 1. Ask a KIELER administrator to add you to the //kieler-dev// Gitorious team. | ||
| 43 | 1. Copy the repository URI git@git.rtsys.informatik.uni-kiel.de:kieler/mainline.git into the clipboard. | ||
| 44 | 1. Open the //Git Repositories// view, right-click it, select //Paste Repository Path or URI//, select //ssh// connection protocol, //Next//, select master branch, //Next//, select destination directory (e.g. /home/<username>/shared/kieler), //Finish//. Wait for the repository to be downloaded to your computer. Note that the whole history of the repository will be stored in your local filesystem, which is pretty awesome. | ||
| 45 | 1. Right-click the //Working directory// entry in the //kieler// repository, select //Import Projects//, //Next//, select the projects that you want in your workspace, //Finish.// | ||
| 46 | |||
| 47 | In case you already checked out the repository over the read-only git protocol, but you want to be able to commit to the remote repository, open the //Git Repositories// view, right-click //kieler/Remotes/origin//, select //Configure Push//, and change the URI to the ssh variant. | ||
| 48 | |||
| 49 | Checking out on the command line is done with the command git clone <URI> <local path>. Instead of the URI you can also use a path to an existing repository, which then creates a clone of that repository. | ||
| 50 | |||
| 51 | == Adding an Existing Local Repository to EGit == | ||
| 52 | |||
| 53 | If you have already cloned the KIELER repository and are only looking for a way to import it into EGit, follow these steps: | ||
| 54 | |||
| 55 | 1. Click the button //Add an existing local Git Repository to this view// in the //Git Repositories// view and enter the local path. | ||
| 56 | 1. Right-click the //Working directory// entry in the added repository, select //Import Projects//, //Next//, select the projects that you want in your workspace, //Finish.// | ||
| 57 | |||
| 58 | = Updating the Repository = | ||
| 59 | |||
| 60 | Your working copy must be clean before you can merge any updates into it. Therefore, always commit your changes locally before you pull. If you don't want to commit them into the master branch, commit them into a new branch. Note that pulling is the same as fetching remote changes and merging them into your local branch. Since a normal merge operation is involved, this can lead to conflicts, which need to be resolved as described below. Note that pulling always merges the remote changes into your current branch. If that's not what you want, checkout the correct branch first or just do a //fetch//. | ||
| 61 | |||
| 62 | Do one of the following three things: | ||
| 63 | |||
| 64 | * Right-click one of the KIELER projects, then from the //Team// submenu choose //Pull//. | ||
| 65 | * Right-click the KIELER repository in the //Git Repositories// view and click //Pull//. | ||
| 66 | * Enter {{code language="none"}}git pull{{/code}} on the command line and refresh your workspace. | ||
| 67 | |||
| 68 | = Resolving Conflicts = | ||
| 69 | |||
| 70 | Whenever branches are merged or rebased, conflicts can occur. They can be resolved by adjusting the state of your working copy, marking it as clean, and committing the changes. Conflicted files are modified so they contain both your version and the remote version. Edit them until all conflict areas are clean. In Eclipse this can be done by right-clicking the conflicted files - //Team - Merge Tool//. | ||
| 71 | |||
| 72 | {{warning}} | ||
| 73 | If you try to pull from a remote repository or merge branches although you have local uncommitted changes, and the merge would affect the same files, Git leaves those files as they are, thus discarding the changes that would be made by the pull or merge operation. As a consequence, committing such a conflicted state would ignore the changes of the merged branch even if the commit graph looks like a regular merge has happened. Therefore keep in mind never to pull or merge with uncommitted changes. | ||
| 74 | {{/warning}} | ||
| 75 | |||
| 76 | **Taking your version of conflicted files:** {{code language="none"}}git checkout --ours <path>{{/code}} | ||
| 77 | |||
| 78 | **Taking the remote version of conflicted files:** {{code language="none"}}git checkout --theirs <path>{{/code}} | ||
| 79 | |||
| 80 | = Committing Changes = | ||
| 81 | |||
| 82 | Git manages changes in two separate steps: | ||
| 83 | |||
| 84 | 1. Commit changes to your local repository. | ||
| 85 | 1. Push the commit to the remote repository. | ||
| 86 | |||
| 87 | The first step can be done offline, which is very useful in situations where you don't have an internet connection, but would like to save intermediate development snapshots in the history. You can push multiple commits to the remote repository, which for example means that if you are performing changes that would create broken intermediate states, you can commit any number of snapshots locally and only push the whole bundle of commits after you have reached a state that works again. | ||
| 88 | |||
| 89 | If another developer has pushed changes since the last time you have pulled from the server, your attempt to push your commits online may fail. In this case you need to pull the remote changes before you can push. Never use force pushing! ({{code language="none"}}git push -f{{/code}}) | ||
| 90 | |||
| 91 | {{info title="Before you commit anything..."}} | ||
| 92 | Make sure you have set up your name and email address properly, as described on the [[doc:Configuring Eclipse]] page. | ||
| 93 | {{/info}} | ||
| 94 | |||
| 95 | == Committing == | ||
| 96 | |||
| 97 | To commit changes with EGit, do one of the following and select the files you would like to commit: | ||
| 98 | |||
| 99 | * Right-click one of the KIELER projects, and from the //Team// submenu, choose //Commit//. | ||
| 100 | * Right-click the KIELER repository in the //Git Repositories// view and choose //Commit//. | ||
| 101 | |||
| 102 | To commit your changes on the command line, do the following: | ||
| 103 | |||
| 104 | 1. Use {{code language="none"}}git add{{/code}} to select (//stage//) the files you would like to commit (new files as well as modified files). | ||
| 105 | 1. Enter {{code language="none"}}git commit{{/code}} to create a commit from the staged files. | ||
| 106 | |||
| 107 | == Pushing == | ||
| 108 | |||
| 109 | To push your commits to a remote repository with EGit, do one of the following: | ||
| 110 | |||
| 111 | * Right-click one of the KIELER projects, and from the //Team// submenu, choose //Push to Upstream//. | ||
| 112 | * Right-click the KIELER repository in the //Git Repositories// view and choose //Push to Upstream//. | ||
| 113 | |||
| 114 | To push your commits on the command line, enter {{code language="none"}}git push{{/code}}. | ||
| 115 | |||
| 116 | = Getting Earlier Versions of Files = | ||
| 117 | |||
| 118 | If you want to revert //all// your local changes and get back to the previous repository state, use {{code language="none"}}git reset --hard{{/code}} or the //Reset// item in the EGit context menu. If you only want to revert some specific files, do one of the following: | ||
| 119 | |||
| 120 | * Right click the files, click //Replace With//, click //HEAD Revision//. | ||
| 121 | * Enter {{code language="none"}}git checkout <path>{{/code}} on the command line. | ||
| 122 | |||
| 123 | By giving a branch, tag, or commit number in git checkout <commit> <path>, you can get to any existing version of the files. If no path is given, git checkout <commit> switches your whole working copy and index to the specified branch, tag, or commit number. If git reset is given a commit number, the current branch is modified to point at the given commit. | ||
| 124 | |||
| 125 | {{warning}} | ||
| 126 | This is a brute force modification, and you probably won't be able to push the new branch | ||
| 127 | {{/warning}} | ||
| 128 | |||
| 129 | = Cleaning Your Working Directory = | ||
| 130 | |||
| 131 | In case the working directory is messed up with unstaged files, which are not affected by git reset ~-~-hard, a clean up is achieved by means of git clean -f. The additional switch -d applies this to directories, respectively. Hence, git reset + git clean act like svn revert. | ||
| 132 | |||
| 133 | git clean -X removes only the files that are ignored by Git, that is mainly the .class files generated by the Java compiler. A full rebuild is required afterwards. | ||
| 134 | |||
| 135 | = Branching and Merging = | ||
| 136 | |||
| 137 |