Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 92eda7f

Browse files
committed
womework-week1 amendments
1 parent b24f0b3 commit 92eda7f

File tree

1 file changed

+33
-27
lines changed

1 file changed

+33
-27
lines changed

Week1/homework-week1.md

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,44 @@ https://github.com/rabrad/animals
44

55
Recap:
66

7-
1. admin creates a new repository on github called **animals**.
8-
Done by me as admin.
7+
1. admin creates a new repository on github called **animals**:
98

10-
2. admin adds a file called “zoo.txt” with some animals generally found in a zoo.
11-
From CLI:
12-
mkdir animals
13-
touch zoo.txt
14-
echo "Lion" "Zepra" "heppo" > zoo.txt
9+
- Done by me as admin.
1510

16-
3. admin commits and pushes the changes (in master branch).
17-
git add .
18-
git commit -m "Made file zoo.txt"
11+
2. admin adds a file called “zoo.txt” with some animals generally found in a zoo:
1912

20-
4. user forks the repository created by admin and bring it to their machine (covered during classwork).
21-
Done by user.
22-
forks the repository.
23-
And from CLI:
24-
git cloan http://....
13+
- mkdir animals
14+
- touch zoo.txt
15+
- echo "Lion" "Zepra" "heppo" > zoo.txt
2516

26-
5. user makes a new branch called user-dev.
27-
git branch user-dev
17+
3. admin commits and pushes the changes (in master branch):
2818

29-
6. user adds another file called “pets.txt” with some animals generally found in a home.
30-
touch pets.txt
31-
echo "cat" "dog" "horse" > pets.txt
19+
- git add .
20+
- git commit -m "Made file zoo.txt"
3221

33-
7. user commits and pushes his branch to remote.
34-
git add .
35-
git commit -m "Made file pets.txt"
22+
4. user forks the repository created by admin and bring it to their machine (covered during classwork):
3623

37-
8. user creates a pull request(PR) to merge changes from user's _user-dev_ branch to admin's _master_ branch.
38-
Done by user on github.
24+
- forks the repository.
25+
- git cloan http://....
3926

40-
9. admin reviews the pull request and approves and merges changes.
41-
Done by admin on github
27+
5. user makes a new branch called user-dev:
28+
29+
- git branch user-dev
30+
31+
6. user adds another file called “pets.txt” with some animals generally found in a home:
32+
33+
- touch pets.txt
34+
- echo "cat" "dog" "horse" > pets.txt
35+
36+
7. user commits and pushes his branch to remote:
37+
38+
- git add .
39+
- git commit -m "Made file pets.txt"
40+
41+
8. user creates a pull request(PR) to merge changes from user's _user-dev_ branch to admin's _master_ branch:
42+
43+
- Done by user on github.
44+
45+
9. admin reviews the pull request and approves and merges changes:
46+
47+
- Done by admin on github

0 commit comments

Comments
 (0)