Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • Confluence.Code.ConfluencePageClass[0]

Details

Page properties

Content

...	...	@@ -53,4 +53,64 @@
53	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	54
55	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//
	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	+

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-884797
	1	+884800

URL

...	...	@@ -1,1 +1,1 @@
1		-https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/KIELER/pages/884797/Using Git
	1	+https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/KIELER/pages/884800/Using Git