Skip to content
Merged
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
a361c54
Merge pull request #18 from SarangAP/15-thing-i-want-to-know-deployin…
SarangAP Feb 22, 2023
2b12309
adding to what i learned
SarangAP Feb 22, 2023
830dbe2
Merge pull request #20 from SarangAP/19-things-i-learned-generating-s…
SarangAP Feb 22, 2023
ff2a9bd
adding to what I don't understand
SarangAP Feb 22, 2023
c7e44cb
Merge pull request #22 from SarangAP/21-dont-understand-avoiding-merg…
SarangAP Feb 22, 2023
55b3d82
dockerimg
km776 Feb 22, 2023
6f68279
Merge pull request #14 from km776/5-importance-of-docker-images close…
km776 Feb 22, 2023
04f2444
Merge branch 'main' into 5-importance-of-docker-images
km776 Feb 22, 2023
e679a66
Merge pull request #24 from km776/5-importance-of-docker-images
km776 Feb 22, 2023
910c0e8
understanding git+github fr this time
km776 Feb 22, 2023
d961f5b
Merge pull request #15 from km776/13-understanding-gitgithub closes #13
km776 Feb 22, 2023
ceb8885
Merge branch 'main' into 13-understanding-gitgithub
km776 Feb 22, 2023
a70ffe7
Merge pull request #25 from km776/13-understanding-gitgithub
km776 Feb 22, 2023
50a40a1
understanding docker
km776 Feb 22, 2023
75e5f85
Merge pull request #16 from km776/12-understanding-docker
km776 Feb 22, 2023
9e53c58
Merge branch 'main' into 12-understanding-docker
km776 Feb 22, 2023
d44a830
Merge pull request #26 from km776/12-understanding-docker
km776 Feb 22, 2023
c1aa9d9
new git branch
km776 Feb 22, 2023
3be8bb9
Merge pull request #17 from km776/9-new-branch closes #9
km776 Feb 22, 2023
bb1c6a8
Merge branch 'main' into 9-new-branch
km776 Feb 22, 2023
ba978ac
Merge pull request #27 from km776/9-new-branch
km776 Feb 22, 2023
63a9630
git efficiency
km776 Feb 22, 2023
2cbd8ba
Merge pull request #18 from km776/11-efficiency closes #11
km776 Feb 22, 2023
2c70c8c
Merge branch 'main' into 11-efficiency
km776 Feb 22, 2023
a00a9d0
Merge pull request #28 from km776/11-efficiency
km776 Feb 22, 2023
6c569f7
make new repos
km776 Feb 22, 2023
b1b87f0
Merge pull request #19 from km776/10-new-assignment-repos closes #10
km776 Feb 22, 2023
892fce3
Merge branch 'main' into 10-new-assignment-repos
km776 Feb 22, 2023
b3bd09d
Merge pull request #29 from km776/10-new-assignment-repos
km776 Feb 22, 2023
f99ea17
compose docker image
km776 Feb 22, 2023
0b0949c
Merge branch 'main' into 8-docker-image
km776 Feb 22, 2023
d301b63
Merge pull request #31 from km776/8-docker-image
km776 Feb 22, 2023
d5f9963
Merge pull request #20 from km776/8-docker-image closes #8
km776 Feb 22, 2023
986219b
Update README.md
ericcchuang Feb 22, 2023
3abb1ef
fetch pull diff
km776 Feb 22, 2023
0b73393
Update README.md
ericcchuang Feb 22, 2023
5ba0b1d
Merge pull request #21 from km776/7-difference-between-fetch-and-pull…
km776 Feb 22, 2023
549f689
Update README.md
ericcchuang Feb 22, 2023
5a6a032
Merge pull request #32 from km776/7-difference-between-fetch-and-pull
km776 Feb 22, 2023
355878b
Update README.md
ericcchuang Feb 22, 2023
213ed73
Update README.md
ericcchuang Feb 22, 2023
1c980d7
troubleshoot
km776 Feb 22, 2023
461d8ce
Update README.md
ericcchuang Feb 22, 2023
26728f5
Merge pull request #33 from km776/6-troubleshooting-problems
km776 Feb 22, 2023
1b1540b
Merge branch 'main' into 12-things-i-dont-understand-linux-terminal
ericcchuang Feb 23, 2023
f52c9d4
Merge pull request #34 from eyh3/12-things-i-dont-understand-linux-te…
ericcchuang Feb 23, 2023
a197062
Merge branch 'main' into 11-things-i-learned-how-to-host-on-localhost
ericcchuang Feb 23, 2023
b317201
Merge pull request #35 from eyh3/11-things-i-learned-how-to-host-on-l…
ericcchuang Feb 23, 2023
f4702d3
Merge branch 'main' into 9-thing-i-want-to-know-php
ericcchuang Feb 23, 2023
08b3690
Merge pull request #36 from eyh3/9-thing-i-want-to-know-php
ericcchuang Feb 23, 2023
2c4f069
Merge branch 'main' into 7-things-i-learned-github-classroom
ericcchuang Feb 23, 2023
efc53d2
Merge pull request #37 from eyh3/7-things-i-learned-github-classroom
ericcchuang Feb 23, 2023
b2af259
Merge branch 'main' into 6-thing-i-want-to-know-javascript
ericcchuang Feb 23, 2023
0bccaa8
Merge branch 'km776-patch-1' into 6-thing-i-want-to-know-javascript
ericcchuang Feb 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and
### Your list should look like this:

#### Things we understand**

1. Docker containers[1]
2. git stash[1]
3. SSH keys[1]
4. Make a branch in Git [1]
5. Make new repos [1]
6. Compose Docker Images [1]
7. How to host a website using localhost[1]
8. How to use GitHub Classroom[1]

#### Things we don't understand
1. How to avoid merge conflicts[1]
Expand All @@ -29,7 +30,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and
4. Importance of Docker Images [1]
5. git fetch vs. git pull [1]
6. Troubleshooting problems in GitHub Actions [1]

7. What is the point of Linux Terminal over Windows?[1]

#### Things we want to know next**
1. Using kubernetes with docker[1]
Expand All @@ -38,8 +39,8 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and
4. Thorough Understanding of Git/GitHub [1]
5. General Understanding of Docker [1]
6. How to use Git efficiently [1]
7. How to program with PHP[1]
8. How to program using JavaScript [1]

## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL
Add your ssh public key to github - See video
Expand Down