Summary

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

Details

Page properties

Content

...	...	@@ -671,38 +671,8 @@
671	671
672	672	[[image:attach:turing-graph-04.png]]
673	673
674		-The two commits made in {{code language="none"}}sketches{{/code}} are reapplied starting from the head of the {{code language="none"}}master{{/code}} branch. The resulting structure of commits is much cleaner than before. rebase{{code language="none"}}{{/code}} even allows to squeeze multiple commits into one. Note that in this example a merge conflict had to be resolved in the same way as it was done in Section "Branching and Merging"; instead of committing the resolved file, the rebase command is resumed with {{code language="none"}}git rebase --continue{{/code}}.
	674	+The two commits made in {{code language="none"}}sketches{{/code}} are reapplied starting from the head of the {{code language="none"}}master{{/code}} branch. The resulting structure of commits is much cleaner than before. It is even possible to squeeze multiple commits into one using {{code language="none"}}rebase{{/code}}. Note that in this example a merge conflict had to be resolved in the same way as it was done in Section "Branching and Merging"; instead of committing the resolved file, the rebase command is resumed with {{code language="none"}}git rebase --continue{{/code}}.
675	675
676	676	{{warning}}
677	677	Never rebase a branch that is already pushed online! Due to the structural change the rebased branch is no longer compatible with the previous one, and pushing it will fail, since fast-forward merge is not possible.
678	678	{{/warning}}
679		-
680		-=== Tagging ===
681		-
682		-Finally Alan Turing has made a great success in the development of his Machine, and he would like to fix that stage as "Milestone 1". Help him by tagging the current state of the project:
683		-
684		-{{noformat}}
685		-$ git tag milestone1
686		-{{/noformat}}
687		-
688		-Then the head of the current branch is stored under the name {{code language="none"}}milestone1{{/code}}, so it can be found very easily at later stages of the project:
689		-
690		-{{noformat}}
691		-$ git tag
692		-milestone1
693		-$ git checkout milestone1
694		-Note: checking out 'milestone1'.
695		-
696		-You are in 'detached HEAD' state. You can look around, make experimental
697		-changes and commit them, and you can discard any commits you make in this
698		-state without impacting any branches by performing another checkout.
699		-
700		-If you want to create a new branch to retain commits you create, you may
701		-do so (now or later) by using -b with the checkout command again. Example:
702		-
703		- git checkout -b new_branch_name
704		-
705		-HEAD is now at 957f686... Merge remote branch 'gitorious/master'
706		-{{/noformat}}
707		-
708		-Tags can also be loaded to the server using the {{code language="none"}}push{{/code}} command.

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-2982178
	1	+2982168

URL

...	...	@@ -1,1 +1,1 @@
1		-https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/WS12EclPract/pages/2982178/Git
	1	+https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/WS12EclPract/pages/2982168/Git