30 i dont know how to config

.github/ISSUE_TEMPLATE/master-pull-request.md

@@ -1,6 +1,10 @@
 ---
 name: Master Pull Request
+<<<<<<< HEAD
 about: This is for your master pull request to merge your master into this repo
+=======
+about: This is for your master pull request to merge your master into this repo.
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6
 title: Put your UCID as the title (replace this text)
 labels: Compiled List
 assignees: ''

.github/ISSUE_TEMPLATE/things-i-don-t-understand.md

@@ -1,8 +1,15 @@
 ---
+<<<<<<< HEAD
 name: Things I Don't Understand
 about: This is for adding issues that you don't understand
 title: ''
 labels: Things I Don't Know
+=======
+name: Things I don't understand
+about: Please add one item that you don't understand
+title: "[Don't Understand]"
+labels: Don't Understand
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/things-i-learned.md → .github/ISSUE_TEMPLATE/things-i-know.md

@@ -1,8 +1,12 @@
 ---
-name: Things I learned
+name: Things I know
 about: Add one item for each thing you learned keep to max of 255 characters
 title: "[Things I Learned]"
+<<<<<<< HEAD:.github/ISSUE_TEMPLATE/things-i-learned.md
 labels: Things I Know
+=======
+labels: I know
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6:.github/ISSUE_TEMPLATE/things-i-know.md
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/things-i-want-to-know.md

@@ -1,10 +1,19 @@
 ---
 name: Things I want to know
 about: Describe this issue template's purpose here.
+<<<<<<< HEAD
 title: 'Thing I want to know: <file in title> [Thing I want to Knows]'
 labels: Things I Want To Know
+=======
+title: ''
+labels: Want to Know
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6
 assignees: ''
 
 ---
 
+<<<<<<< HEAD
 Please describe what you want to know in less than 255 characters.
+=======
+
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6

README.md

@@ -15,11 +15,13 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and
 1.  I understand how to push to github
 2.  github conflict
 3.  how to merge
+4.  How to merge things even better
 ### Things you don't understand about what we are doing
 1. I am lost on hows to pro-Docker
 2. I am lost on hows to pro-Linux
 3. I am lost on hows to setup my domain name with my Oracle account
 4. I am lost on hows pull for this assignment
+5. I am lost on how to config
 ### Things you want to know next
 1. setup domain name
 2. why tedious assignment
@@ -105,3 +107,16 @@ Collaborating on GitHub:
 13.  update your local main branch with the changes from the merge by doing git pull origin main
 14. Repeat again, and again, and again
 
+=======
+1. Add items to the list
+=======
+1. I know how to make ssh keys
+>>>>>>> 2716e3e74f642aa96b78a25883d4471db75400fd
+### Things you don't understand about what we are doing / web development.
+1. Don't understand forking
+2. Don't Understand Oracle Cloud
+3. Don't understand the difference between cloning and forking
+### Things you want to know next
+1. How to connect viewjs to elastic search
+2. This is something I want to know
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6