diff --git a/book/workflows/collaboration.md b/book/workflows/collaboration.md index 8c445b6..a770e4d 100644 --- a/book/workflows/collaboration.md +++ b/book/workflows/collaboration.md @@ -20,22 +20,22 @@ The steps involved are as follows: - branching `````` -``````{tab-item} ... user type 4 and 5... +``````{tab-item} ... user type 4 and 5 `````{tab-set} -````{tab-item} Open repository for first time +````{tab-item} Open repository for first time... -**... by -(a) oopening the repository locally (cloning) and +**... by
+(a) opening the repository locally (cloning) and
(b) creating your own version (branching) or selecting existing version (checkout branch):** - cloning - branching / checkout branch ```` -````{tab-item} Work in previously opened repository +````{tab-item} Work in previously opened repository... -**... by -(a) updating your repository (pulling) and +**... by
+(a) updating your repository (pulling) and
(b) creating your own version (branching) or select existing version (checkout branch):** - pulling @@ -57,12 +57,12 @@ The steps involved are as follows: ``````{tab-item} ... user type 4... `````{tab-set} -````{tab-item} ... on a brand new version (branch) +````{tab-item} ... on a brand new version (branch)... -**... by -(a) making changes on a single / multiple file(s), -(b) selecting changes to be added to the Git-timeline (staging), -(c) adding those to the Git-timeline (committing) and +**... by
+(a) making changes on a single / multiple file(s),
+(b) selecting changes to be added to the Git-timeline (staging),
+(c) adding those to the Git-timeline (committing) and
(d) adding those changes to GitLab/GitHub (pushing):** - adding or making changes to file(s) @@ -70,13 +70,13 @@ The steps involved are as follows: - committing - pushing ```` -````{tab-item} ... on an existing version (branch) +````{tab-item} ... on an existing version (branch)... -**... by -(a) regularly obtaining updates from colleagues from GitLab/GitHub (pulling), -(b) solving potential incompatible changes (merge conflicts), -(c) making changes on a single / multiple file(s), -(d) selecting changes to be added to the Git-timeline (staging), +**... by
+(a) regularly obtaining updates from colleagues from GitLab/GitHub (pulling),
+(b) solving potential incompatible changes (merge conflicts),
+(c) making changes on a single / multiple file(s),
+(d) selecting changes to be added to the Git-timeline (staging),
(e) adding those to the Git-timeline (committing) and adding those changes to GitLab/GitHub (pushing):** - pulling @@ -89,18 +89,33 @@ The steps involved are as follows: ````` `````` ``````{tab-item} ... user type 5... -... on ... `````{tab-set} -````{tab-item} ... brand new version (branch) -**... by making changes on a single / multiple file(s), checking changes locally, selecting changes to be added to the Git-timeline (staging), adding those to the Git-timeline (committing) and adding those changes to GitLab/GitHub (pushing):** +````{tab-item} ... on a brand new version (branch)... + +**... by
+(a) making changes on a single / multiple file(s),
+(b) checking changes locally,
+(c) selecting changes to be added to the Git-timeline (staging),
+(d) adding those to the Git-timeline (committing) and
+(e) adding those changes to GitLab/GitHub (pushing):** + - adding or making changes to file(s) - checking changes locally - staging - committing - pushing ```` -````{tab-item} ... existing version (branch) -**... by regularly obtaining updates from colleagues from GitLab/GitHub (pulling), solving potential incompatible changes (merge conflicts), making changes on a single / multiple file(s), checking changes locally, selecting changes to be added to the Git-timeline (staging), adding those to the Git-timeline (committing) and adding those changes to GitLab/GitHub (pushing):** +````{tab-item} ... on an existing version (branch)... + +**... by
+(a) regularly obtaining updates from colleagues from GitLab/GitHub (pulling),
+(b) solving potential incompatible changes (merge conflicts),
+(c) making changes on a single / multiple file(s),
+(d) checking changes locally,
+(e) selecting changes to be added to the Git-timeline (staging),
+(f) adding those to the Git-timeline (committing) and
+(g) adding those changes to GitLab/GitHub (pushing):** + - pulling - solving merge conflicts - adding or making changes to file(s) @@ -109,7 +124,6 @@ The steps involved are as follows: - committing - pushing ```` - `````` ``````` 4. **Check changes online** diff --git a/book/workflows/milestones_issues.md b/book/workflows/milestones_issues.md index 9638a2d..7e848f3 100644 --- a/book/workflows/milestones_issues.md +++ b/book/workflows/milestones_issues.md @@ -31,15 +31,22 @@ This will lead you to this window where you can specify all attributes we mentio The issues in GitHub can be found in your repositery in the top bar. -New Issue
+ +
+ Example Image +
Clicking on `Issues` will open up the page with all the issues on this repositery. -New Issue
+
+ Example Image +
Finally, by clicking the green `New Issue` button you can create a new issue and specify all the attributes we mentioned before! -New Issue
+
+ Example Image +
```{Note} @@ -47,13 +54,15 @@ The follwing steps explain how to create a branch from a new issue. By doing thi ``` After creating the issue, the description of the issue will automatically open. On the bottom left there is an option `create a branch` (in yellow) from this issue. This will create a new branch in the repositery which you can use to solve the issue. -New Issue
+
+ Example Image +
Clicking on `create a branch` will open the following window in which you can specify the name and the repositery. -New Issue
- -``` +
+ Example Image +
```` `````