Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Version Control with Git - Archived
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
HIFIS
HIFIS Software Services
Education and Training
Workshop Materials
Git and GitLab Courses
Version Control with Git - Archived
Commits
a899ff2e
Commit
a899ff2e
authored
4 years ago
by
Tobias Schlauch
Browse files
Options
Downloads
Patches
Plain Diff
Move tagging at the end of episode 10
parent
f33413dc
No related branches found
No related tags found
1 merge request
!4
Resolve "Move tagging to episode 10"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
episodes/09-remotes-in-gitlab.md
+0
-11
0 additions, 11 deletions
episodes/09-remotes-in-gitlab.md
episodes/10-collaboration-with-others.md
+13
-0
13 additions, 0 deletions
episodes/10-collaboration-with-others.md
with
13 additions
and
11 deletions
episodes/09-remotes-in-gitlab.md
+
0
−
11
View file @
a899ff2e
...
...
@@ -55,17 +55,6 @@ Please see the original episodes for further details about the introduced topics
-
Explain that all changes were included
**without**
merge commit ("fast-forward")
-
Show
[
Atlassian's "Fast Forward Merge" figure
](
https://www.atlassian.com/git/tutorials/using-branches/git-merge
)
### Mark the Results Using a Tag
-
[
Human-usable pointer to a point in the version history
](
https://www.endoflineblog.com/img/oneflow/hotfix-branch-merge-final.png
)
(similar to branch names &
`HEAD`
)
-
Create a tag:
-
`git tag v1.0 -m "First publishable draft"`
-
Push the tag to the remote repository:
-
`git push origin v1.0`
-
Explain that
`--tags`
will push all tags at once
-
Explain that
`v1.0`
,
`HEAD`
, a commit ID and a branch name can refer to the same commit
## Key Points
-
Local copy is backup of remote => Different local backup needed!
...
...
This diff is collapsed.
Click to expand it.
episodes/10-collaboration-with-others.md
+
13
−
0
View file @
a899ff2e
...
...
@@ -79,8 +79,21 @@ For that purpose, we switch to our local Git repository.
-
`git graph`
-
Highlight that both
`master`
branches now point to the merge commit
## Mark the Results using a Tag (Owner View)
-
[
Tags are human-usable pointer to a point in the version history
](
https://www.endoflineblog.com/img/oneflow/hotfix-branch-merge-final.png
)
(similar to branch names &
`HEAD`
)
-
Create a tag:
-
`git tag v0.1 -m "Mark initial version"`
-
Push the tag to the remote repository:
-
`git push origin v0.1`
-
Explain that
`--tags`
will push all tags at once
-
Explain that
`v0.1`
,
`HEAD`
, a commit ID and a branch name can refer to the same commit
-
Show tags in GitLab
## Key Points
-
Branches allow you to track code changes for different tasks in parallel.
-
Merge requests should be used for reviews and visual tracking of changes before merge.
-
`git fetch`
can be used to update information of tracked remotes.
-
Tags help you to mark important versions explicitly
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment