Skip to content
Snippets Groups Projects
Commit a899ff2e authored by Tobias Schlauch's avatar Tobias Schlauch
Browse files

Move tagging at the end of episode 10

parent f33413dc
No related branches found
No related tags found
1 merge request!4Resolve "Move tagging to episode 10"
......@@ -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!
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment