|
|
@@ -1,22 +1,22 @@
|
|
|
# Add new content
|
|
|
|
|
|
-In this chapter we will create the functions to say Hello in the different languages from the table above.
|
|
|
+In this chapter we will fill the HTML file to see different sections in different styles.
|
|
|
|
|
|
-In the beginning you will modify the file `greetings.sh` by adding your function e.g. `say_hello_catalan()`.
|
|
|
+In the beginning you will modify the file `styles.css` by adding your own style. Here there an usefull link for [CSS Colors](https://www.w3schools.com/cssref/css_colors.asp)
|
|
|
|
|
|
-Then you will modify `../run.sh` to call your function.
|
|
|
+Then you will modify `branching-website.html` to apply your style to your own section.
|
|
|
|
|
|
-In a further chapter of this tutorial, we will merge all the calls in the same file `run.sh` and we will see how git helps on the process of resolving conflicts.
|
|
|
+In a further chapter of this tutorial, we will merge all the styles in the same file `branching-website.html` and we will see how git helps on the process of resolving conflicts.
|
|
|
|
|
|
#### Exercise 6 – Perform function commit
|
|
|
|
|
|
-Now you have time to make changes in Git_Training project, i.e. modify 'greetings.sh' file and develop your function. After that, if we check the status of our project again, Git tells us that it’s noticed a new file. We can tell Git to track a file using git add.
|
|
|
+Now you have time to make changes in Git_Training project, i.e. modify 'styles.css' file and develop your style. After that, if we check the status of our project again, Git tells us that it’s noticed a modified file. We can tell Git to track a file using git add.
|
|
|
|
|
|
```
|
|
|
git add .
|
|
|
```
|
|
|
|
|
|
-Git now knows that it’s supposed to keep track of 'greetings.sh', but it hasn’t recorded these changes as a commit yet. To get it to do that, we need to run one more command:
|
|
|
+Git now knows that it’s supposed to keep track of 'styles.css', but it hasn’t recorded these changes as a commit yet. To get it to do that, we need to run one more command:
|
|
|
|
|
|
```
|
|
|
git commit -m "message explaining what you have done. Fixes issue #issue_number"
|
|
|
@@ -36,18 +36,14 @@ git log
|
|
|
|
|
|
#### Exercise 7 – Perform run script commit
|
|
|
|
|
|
-You can now modify `run.sh` script to add the call to your newly created function (do not forget to source the file containing the function).
|
|
|
+You can now modify `branching-website.html` file to add the section `div` to your newly created style.
|
|
|
|
|
|
-Test it:
|
|
|
+Test it by opening the html file in a web browser.
|
|
|
|
|
|
-```
|
|
|
-bash run.sh
|
|
|
-```
|
|
|
-
|
|
|
-When you are sure it works (it greets you in english and in your choosen language), perform a separate commit by following similar steps as in previous exercise:
|
|
|
+When you are sure it's fine, perform a separate commit by following similar steps as in previous exercise:
|
|
|
|
|
|
```
|
|
|
-git add run.sh
|
|
|
+git add branching-website.html
|
|
|
git commit
|
|
|
```
|
|
|
|
