|
@@ -18,7 +18,7 @@ The outputs tells what branch you are on, marked with an asterisk. By default (i
|
|
|
|
|
|
## Exercise 10 – Checkout a branch from git_tutorial project
|
|
## Exercise 10 – Checkout a branch from git_tutorial project
|
|
|
|
|
|
-Since others might have asked you to review and test new branches at this stage you would like to have a look at the code and test it. To review a code may be enough to browse it in a Gogs window.
|
|
|
|
|
|
+Since others might have asked you to review and test new branches at this stage you would like to have a look at the code and test it. To review a code may be enough to browse it in a GitHub window.
|
|
|
|
|
|
But in order to test it you have to checkout it to your `working copy` from the command line:
|
|
But in order to test it you have to checkout it to your `working copy` from the command line:
|
|
|
|
|
|
@@ -35,8 +35,8 @@ git checkout <other_branch_name>
|
|
And it will update the contents of your directory giving an output similar to this:
|
|
And it will update the contents of your directory giving an output similar to this:
|
|
|
|
|
|
```
|
|
```
|
|
-Branch greetings_spanish set up to track remote branch greetings_spanish from origin.
|
|
|
|
-Switched to a new branch 'greeting_spanish'
|
|
|
|
|
|
+Branch ceres05 set up to track remote branch ceres05 from origin.
|
|
|
|
+Switched to a new branch 'ceres05'
|
|
```
|
|
```
|
|
|
|
|
|
**CAUTION**: If you have uncommited changes in your project and you perform a `checkout` all your changes will be dragged into the other branch. You will see a `'M'` after the checkout. To avoid that it is preferable to do always `git commit` before doing a checkout.
|
|
**CAUTION**: If you have uncommited changes in your project and you perform a `checkout` all your changes will be dragged into the other branch. You will see a `'M'` after the checkout. To avoid that it is preferable to do always `git commit` before doing a checkout.
|
|
@@ -56,7 +56,7 @@ Your branch is up-to-date with 'origin/master'.
|
|
Untracked files:
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
|
|
- greetings_catalan.sh
|
|
|
|
|
|
+ styles.css
|
|
|
|
|
|
nothing added to commit but untracked files present (use "git add" to track)
|
|
nothing added to commit but untracked files present (use "git add" to track)
|
|
```
|
|
```
|
|
@@ -65,17 +65,13 @@ nothing added to commit but untracked files present (use "git add" to track)
|
|
|
|
|
|
Once you have checked out to the branch you have to test you can open the files in your preferred text editor and review them.
|
|
Once you have checked out to the branch you have to test you can open the files in your preferred text editor and review them.
|
|
|
|
|
|
-To test it you only have to do:
|
|
|
|
-
|
|
|
|
-```
|
|
|
|
-bash run.sh
|
|
|
|
-```
|
|
|
|
|
|
+To test it you only have to open the HTML in a web browser.
|
|
|
|
|
|
If the program does the right thing you can express your approval to the merge request:
|
|
If the program does the right thing you can express your approval to the merge request:
|
|
|
|
|
|
## Exercise 12 – Approve a pull request
|
|
## Exercise 12 – Approve a pull request
|
|
|
|
|
|
-* Open the browser and go to the Gogs project Git_Training main page.
|
|
|
|
|
|
+* Open the browser and go to the GitHub project Git_Training main page.
|
|
* Pull requests.
|
|
* Pull requests.
|
|
* Choose the pull request you are willing to approve.
|
|
* Choose the pull request you are willing to approve.
|
|
* Go to “Write” in the tab discussion, and say you are right with the pull.
|
|
* Go to “Write” in the tab discussion, and say you are right with the pull.
|