Skip to content

Commit 5f4dfed

Browse files
authored
Merge pull request #17 from UMLCloudComputing/feat--Update-Tutorials-section
fix: build issue fix with broken links to index.md
2 parents 6cc3183 + 3568fac commit 5f4dfed

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

docs/tutorials/Git Version Control/Basics/Branch.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ sidebar_position: 6
66

77
### Using Git branches
88

9-
A [branch](./Index.md/#branch) is a seperate version of the main repository.<br/>
9+
A [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch) is a seperate version of the main repository.<br/>
1010
Branches are particuarly useful when a developer wants to update parts of a large project.
1111

1212
Git branches allow development on a new features and designs independent from other work on the main branch.<br/>
13-
When the work is complete on a branch, it can be [merged](./Index.md/#merge) back into the main branch/project.<br/>
13+
When the work is complete on a branch, it can be [merged](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#merge) back into the main branch/project.<br/>
1414
With branches, it's also possible to work on different parts of a project simultaneously without any part impacting another.
1515

1616
### Creating a new Branch
1717

18-
Let's create a new [branch](./Index.md/#branch) to work on a feature without modifying the main project's working code:
18+
Let's create a new [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch) to work on a feature without modifying the main project's working code:
1919

2020
``` bash
2121
[user@localhost] $ git branch hello-world-pictures
2222
```
23-
The command `git branch hello-world-pictures` will create a new [branch](./Index.md/#branch) called "hello-world-pictures".<br />
23+
The command `git branch hello-world-pictures` will create a new [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch) called "hello-world-pictures".<br />
2424
Let's confirm that the branch was created:
2525
``` bash
2626
[user@localhost] $ git branch
@@ -29,12 +29,12 @@ hello-world-pictures
2929
```
3030
> Important: Whenever creating new branches, the branch from which the *new* branch is sourced from is the branch which was mounted when the git branch command was called. In scenario above, the command was called from within the `master` branch. Hence, all the initial files and changes are sourced from the `master` branch for the `hello-world-pictures` branch.
3131
32-
A new branch called "hello-world-pictures" has been created, however the `*` symbol indicates that we are currently still on the `master` [branch](./Index.md/#branch).
32+
A new branch called "hello-world-pictures" has been created, however the `*` symbol indicates that we are currently still on the `master` [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch).
3333
> When viewing the output of `git branch`, the `*` symbol indicates the current branch.
3434
3535
![Git-Staging-Diagram-3](../../../../static/img/git-tutorial/git-workflow-3.png)
3636

37-
In order to leave the `master` [branch](./Index.md/#branch) and change to the "hello-world-pictures" [branch](./Index.md/#branch) we have to use the [`checkout`](./Index.md/#checkout) command.
37+
In order to leave the `master` [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch) and change to the "hello-world-pictures" [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch) we have to use the [`checkout`](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#checkout) command.
3838

3939
``` bash
4040
[user@localhost] $ git checkout hello-world-pictures
@@ -77,7 +77,7 @@ Then let's update our html code:
7777
</html>
7878
```
7979
80-
Let's [save and exit](./New%20Files.md/#basic-editing-on-vim) and check the status of the current [branch](./Index.md/#branch)
80+
Let's [save and exit](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#basic-editing-on-vim) and check the status of the current [branch](./Index.md/#branch)
8181

8282
``` bash
8383
[user@localhost] $ git status
@@ -94,14 +94,14 @@ Untracked files:
9494
no changes added to commit (use "git add" and/or "git commit -a")
9595
```
9696

97-
The output indicates that there are tracked changes to `index.html`, however the file is not [staged](./Index.md/#stage) for a [commit](./Index.md/#commit). Moreover, there is also the image `git.png` that is currently untracked.
97+
The output indicates that there are tracked changes to `index.html`, however the file is not [staged](./Index.md/#stage) for a [commit](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#commit). Moreover, there is also the image `git.png` that is currently untracked.
9898

99-
So let's add all the changes to the [staging area](./Index.md/#staging-area):
99+
So let's add all the changes to the [staging area](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#staging-area):
100100
``` bash
101101
[user@localhost] $ git add --all
102102
```
103103

104-
Now let's check the status of the [branch](./Index.md/#branch):
104+
Now let's check the status of the [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch):
105105
``` bash
106106
[user@localhost] $ git status
107107
On branch hello-world-pictures
@@ -113,7 +113,7 @@ Changes to be committed:
113113

114114
Now all the changes are staged and can be committed.
115115

116-
Since we're satifisied with our changes, let's [commit](./Index.md/#commit) them to our [branch](./Index.md/#branch):
116+
Since we're satifisied with our changes, let's [commit](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#commit) them to our [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch):
117117
``` bash
118118
[user@localhost] $ git commit -m "feat: Added image to hello world"
119119
[hello-world-pictures 83d7fb0] feat: Added image to hello world
@@ -130,15 +130,15 @@ Let's check content within our branch:
130130
[user@localhost] $ ls
131131
git.png index.html README.md styles.css
132132
```
133-
Notice how the `hello-world-pictures` [branch](./Index.md/#branch) has the image `git.png`. As per the edits we've made, `index.html` should also have modified code to include the image.
133+
Notice how the `hello-world-pictures` [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch) has the image `git.png`. As per the edits we've made, `index.html` should also have modified code to include the image.
134134

135135
Now's let's change to the `master` branch using the `checkout` command:
136136
``` bash
137137
[user@localhost] $ git checkout master
138138
Switched to branch 'master'
139139
```
140140

141-
Finally let's check the content of this [branch](./Index.md/#branch):
141+
Finally let's check the content of this [branch](/docs/tutorials/Git%20Version%20Control/Basics/Index.md/#branch):
142142
``` bash
143143
[user@localhost] $ ls
144144
index.html README.md styles.css

docs/tutorials/Git Version Control/Basics/Index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Index of terminology within this tutorial
4040
>*Text Editor* <br /> A free and open-source, screen-based text editor. It is an improved version of the **vi** editor. It's primary interface is in text user interface with commands rather than menus or icons.
4141
4242
### Stage
43-
>*verb*: To prepare a file for a [commit](#commit). `git stage`
43+
>*verb*: To prepare a file for a [commit](#commit) by placing it into the [staging area](#staging-area). `git stage`
4444
4545
### Staging area
4646
>*noun*: The *conceptual* area between your working directory and your repostory that maintains all of your [staged](#stage) changes. A useful [diagram](../../../../static/img/git-tutorial/staging-area.png).

0 commit comments

Comments
 (0)