Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8c4146b
Merge pull request #18 from Flx232/15-i-want-to-learn-how-to-write-my…
Flx232 Feb 18, 2023
321868d
Merge pull request #26 from CassandraSehic/elasticsearch
CassandraSehic Feb 21, 2023
9640dba
Merge branch 'main' into 25-resolving-merge-conflicts
ddf-26 Feb 21, 2023
69eabee
Merge branch 'main' into 2-git-pull-request
Flx232 Feb 22, 2023
2da7a56
Merge pull request #19 from ddf-26/2-git-pull-request
Flx232 Feb 22, 2023
0fe03c2
Merge branch 'main' into 4-git-rebase
Flx232 Feb 22, 2023
2737b79
Merge pull request #20 from ddf-26/4-git-rebase
Flx232 Feb 22, 2023
780a212
Merge pull request #21 from ddf-26/6-git-track
Flx232 Feb 22, 2023
0590f70
Merge branch 'main' into 8-git-cherry-pick
Flx232 Feb 22, 2023
cd6ac07
Merge pull request #22 from ss889/21-things-i-want-to-know-different-…
ss889 Feb 23, 2023
f04f9f8
Merge branch 'main' into 8-git-cherry-pick
ss889 Feb 23, 2023
6684934
Merge branch 'main' into 16-openstack
ss889 Feb 23, 2023
c243f64
Merge branch 'main' into 6-git-track
ss889 Feb 23, 2023
b8d9037
Merge branch 'main' into 4-git-rebase
ss889 Feb 23, 2023
9358dc8
Merge branch 'main' into 2-git-pull-request
ss889 Feb 23, 2023
462c267
Merge branch 'main' into 25-resolving-merge-conflicts
ss889 Feb 23, 2023
530efc2
Merge pull request #33 from ddf-26/25-resolving-merge-conflicts
ss889 Feb 23, 2023
1025e7c
Merge branch 'main' into 2-git-pull-request
ss889 Feb 23, 2023
849a7af
Merge pull request #24 from ddf-26/2-git-pull-request
ss889 Feb 23, 2023
7554920
Merge branch 'main' into 6-git-track
ss889 Feb 23, 2023
4aad579
Merge pull request #26 from ddf-26/6-git-track
ss889 Feb 23, 2023
b55c43e
Merge branch 'main' into 8-git-cherry-pick
ss889 Feb 23, 2023
c03f3ed
Merge pull request #27 from ddf-26/8-git-cherry-pick
ss889 Feb 23, 2023
acd047e
Merge branch 'main' into 16-openstack
ss889 Feb 23, 2023
d2b3c23
Merge pull request #31 from ddf-26/16-openstack
ss889 Feb 23, 2023
37c6329
Merge branch 'main' into 4-git-rebase
ss889 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
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/master-lists.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Master Lists
about: This is for your master pull request to merge your master into this repo.
title: Put your UCID as the title (replace this text)
labels: Master List
assignees: ''

---

You need to make a pull request and add the link to the pull request to this issue when you submit.

PULL REQUEST LINK:

UCID:
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/master-pull-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

about: 'For master pull request to merge master into this repo. '
title: ss889
labels: Compiled List
assignees: ss889


---

make a pull request and add a link to the pull request to this issue when you submit.


10 changes: 3 additions & 7 deletions .github/ISSUE_TEMPLATE/things-i-don-t-understand.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
---
name: Things I don't understand
about: Please add one item that you don't understand
title: "[Don't Understand]"
labels: donotknow
assignees: ''

---
labels: Things I don't know

assignees: ''

Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255.
14 changes: 6 additions & 8 deletions .github/ISSUE_TEMPLATE/things-i-learned.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
---
name: Things I learned
about: Add one item for each thing you learned keep to max of 255 characters
title: "[Things I Learned]"
labels: know
assignees: ''

---

Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255.

labels: Things I learned
assignees: ss889

I understand <fill in what you don't here>

12 changes: 7 additions & 5 deletions .github/ISSUE_TEMPLATE/things-i-want-to-know.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
---
name: Things I want to know
about: Describe this issue template's purpose here.
title: ''
labels: wanttoknow

labels: Want to learn
assignees: ''
main


---


Add an item you want to learn


32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
# MyWebClass collaboration and brainstorming activity to identify required content for mywebclass

The purpose of this assignment is to practice collaborating using GIT/GitHub and to do this you need to create a list of things that you have learned in this class, things that you don't understand , and things that you want to learn.

## Instructions
Collaborating on GitHub:

1. Fork the repository: Each person should fork the repository to their own GitHub account. To do this, click the "Fork" button in the top-right corner of the repository page.
2. Enable issues: If you don't see the "Issues" tab in the main menu, you should enable it in the repository settings. Go to the "Issues" tab, and click "Milestones" to add a 0.1.0 milestone and describe it as a consolidated list of issues from your team. On the issues tab you should also create labels for "I Know", "Want to Know", and "Don't Understand". Once you create these labels then go to settings and look for the "Issues Template" and create 3 issue templates that will provide the starting text for each issue filed of that type. At the bottom of each issue you will see that you can automaticly assign a label to that issue type, so connect the respective labels you created with the 3 issue types.
3. Create one issue per item in your list and assign it to the correct issue template.
4. Create a new project tab and create a new project (you have to click the down arrow next to "link project" to change it to new project). When you create a project you need to select "board" and name it "Documentation Tasks".
Expand All @@ -28,14 +21,21 @@ Collaborating on GitHub:

## Put your items here
### Things you understand so far
1. How to create a new branch
2. How to switch branches
3. How to push using gui in vscode
1. I know how to make an ssh key and add it to GitHub.
2. I learned all about GITHUB Issues
3. I learned how to create and name repositories in Github and in Docker.
4. Resolving Merge Conflicts [1]
5. Pull Request[1]
### Things you don't understand about what we are doing / web development.
1. syncing vs merging
2. the proccess of resolving merge conflicts
3. watchtower
1. What some git commands do.
2. I don't understand what exactly a DevOps Engineer does.
3. I don't know how to fix some merge issues.
4. GIt Track[1]
5. Git Cherry-pick[1]
6. Git Rebase[1]
### Things you want to know next
1. Elastic Search
2. Browser dev tools
3. Authentication
1. I want to know more about Docker and its functions.
2. I want to know how what we're learning will be used in web development.
3. I want to know if it's possible to use the terminals of other IDEs to do git commands.
4. OpenStack[1]