Summary

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

Details

Page properties

Content

...	...	@@ -69,7 +69,7 @@
69	69
70	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	71
72		-{{warning title="Warning"}}
	72	+{{warning}}
73	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	74	{{/warning}}
75	75
...	...	@@ -88,8 +88,8 @@
88	88
89	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	90
91		-{{info title="Before you proceed..."}}
92		-Before you commit anything, make sure you have set up your name and email address properly, as described on the [[doc:Configuring Eclipse]] page.
	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	93	{{/info}}
94	94
95	95	== Committing ==
...	...	@@ -113,4 +113,25 @@
113	113
114	114	To push your commits on the command line, enter {{code language="none"}}git push{{/code}}.
115	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	+
116	116

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-884798
	1	+884804

URL

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