@@ -25,7 +25,7 @@ In the following, we work from the collaborator's point of view and want to cont
- Clone the remote Git repository:
-`git clone <REMOTE URL>`
- Show where to retrieve URL from in Gitlab
- Show where to retrieve the URL in Gitlab
- Show current state of the cloned local Git repository:
-`git graph`
- Highlight current branches
...
...
@@ -53,7 +53,7 @@ In the following, we work from the collaborator's point of view and want to cont
## Review the Contribution (Owner View)
Now, we switch into the role of the project owner (you) and review the contribution.
Now, we switch into the role of the project owner and review the contribution.
- Switch to the newly created merge request and review it (see also: [GitLab's documentation about managing merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/reviewing_and_managing_merge_requests.html)):
- Explain about basic aspects to check:
...
...
@@ -67,7 +67,7 @@ Now, we switch into the role of the project owner (you) and review the contribut
## Pull Changes (Collaborator View)
Finally, the collaborator pulls the resulting `master` branch to make sure that the local Git repository is up-to-date.
Then, the collaborator pulls the resulting `master` branch to make sure that the local Git repository is up-to-date.
For that purpose, we switch to our local Git repository.
- Switch to branch `master`:
...
...
@@ -81,7 +81,9 @@ For that purpose, we switch to our local Git repository.
## 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)
Finally, the owner marks the current state via a tag.
-[Tags are human-usable pointer to mark important points 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"`
...
...
@@ -89,11 +91,11 @@ For that purpose, we switch to our local Git 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
- Show the tag 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
- Tags help you to mark important versions explicitly.
