From 4342d3c35fc7ad3dc211cc046f2e0c1e7f487d37 Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 20:27:26 -0400 Subject: [PATCH 01/10] Update README.md --- unit_03/w08d04/morning_exercise/README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/unit_03/w08d04/morning_exercise/README.md b/unit_03/w08d04/morning_exercise/README.md index bf4d8c8..c7432d8 100644 --- a/unit_03/w08d04/morning_exercise/README.md +++ b/unit_03/w08d04/morning_exercise/README.md @@ -1,3 +1,7 @@ +# Morning Exercise + +## Github Collaboration + #### Team Member A - Share your screen with your partner - Create a Github repo called `team-github-practice` @@ -18,3 +22,6 @@ - Click "Clone or Download" and copy the link in the "Clone with HTTPS". - On your local drive, go to your Desktop or Documents or wherever you keep your development files (outside of any other repos) and, in your terminal, clone the repo `git clone` paste the https link from Github. - Note, if you type `git remote`, you will see that only `origin` is created as a remote. You will be pushing to and pulling from origin (and the branch name). + +## Github Branches + From 3cfad385d607f0f605cc3a0932a3cd7e05b88b92 Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 21:02:50 -0400 Subject: [PATCH 02/10] Update README.md --- unit_03/w08d04/morning_exercise/README.md | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/unit_03/w08d04/morning_exercise/README.md b/unit_03/w08d04/morning_exercise/README.md index c7432d8..c31bd30 100644 --- a/unit_03/w08d04/morning_exercise/README.md +++ b/unit_03/w08d04/morning_exercise/README.md @@ -25,3 +25,34 @@ ## Github Branches +#### Team Member A +- From the master branch, create a branch called `main-page` +- From the branch `main-page`, create an index.html page. +- In this file, create a page that will display a welcome message when you open in. +- Add, commit, and push your work **to your branch** + +#### Team Member B +- From the master branch, create a branch called `main-page-styling` +- From the branch `main-page-styling`, create a style.css file. +- In this file, add some general styling on the background, `

` tags, and the font. +- Add, commit, and push your work **to your branch** + +#### Both Team Members +- Create a pull request by going to into your Github account. +- Click on "Compare & pull request" +- Your `base` branch should be `master` and your `compare` branch should be the branch that you created. +- Write a comment and tag your partner in the message. Click "Create pull request". +- DO NOT click "merge". + +#### Team Member A +- Look at your team member's pull request. If it looks okay, click "merge". + +#### Team Member B +- Look at your team member's pull request. If it looks okay, click "merge". + +#### You have not merged your files into master! + +#### Both Team Members +- In your terminal, checkout your `master` branch. +- Pull down the most current data by doing `git pull origin master` +- From ae3fa47506a8afb8f196fecabc4f4724ca2929fd Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 21:10:26 -0400 Subject: [PATCH 03/10] Update README.md --- unit_03/w08d04/morning_exercise/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/unit_03/w08d04/morning_exercise/README.md b/unit_03/w08d04/morning_exercise/README.md index c31bd30..bdda3e2 100644 --- a/unit_03/w08d04/morning_exercise/README.md +++ b/unit_03/w08d04/morning_exercise/README.md @@ -41,7 +41,9 @@ - Create a pull request by going to into your Github account. - Click on "Compare & pull request" - Your `base` branch should be `master` and your `compare` branch should be the branch that you created. -- Write a comment and tag your partner in the message. Click "Create pull request". +- Write a comment. +- On the right side, click on "Assignee" and tag your partner. +- Click "Create pull request". - DO NOT click "merge". #### Team Member A @@ -50,9 +52,9 @@ #### Team Member B - Look at your team member's pull request. If it looks okay, click "merge". -#### You have not merged your files into master! +#### You have now merged your files into master! #### Both Team Members - In your terminal, checkout your `master` branch. - Pull down the most current data by doing `git pull origin master` -- +- Take a look at your files. Everything should be there. From 56d57877f0fda7cdebe4df24303a611940701dd2 Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 21:20:35 -0400 Subject: [PATCH 04/10] Update README.md --- unit_03/w08d04/morning_exercise/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/unit_03/w08d04/morning_exercise/README.md b/unit_03/w08d04/morning_exercise/README.md index bdda3e2..b37b10c 100644 --- a/unit_03/w08d04/morning_exercise/README.md +++ b/unit_03/w08d04/morning_exercise/README.md @@ -58,3 +58,9 @@ - In your terminal, checkout your `master` branch. - Pull down the most current data by doing `git pull origin master` - Take a look at your files. Everything should be there. + +#### Communicate +- You need to link up that style sheet that you created to the index.html file. How will you do it? Discuss and decide who will do it, which branch you will be on, etc. +- Go through the pull request process. +- After the merge, pull the master data to your local file. +- Open the `index.html` to make sure that everyting is connected properly. From 50d768e986d11d0cf7e36939b3429172c2288f4d Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 21:24:14 -0400 Subject: [PATCH 05/10] Update README.md --- unit_03/w08d04/morning_exercise/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/unit_03/w08d04/morning_exercise/README.md b/unit_03/w08d04/morning_exercise/README.md index b37b10c..f8ab0b2 100644 --- a/unit_03/w08d04/morning_exercise/README.md +++ b/unit_03/w08d04/morning_exercise/README.md @@ -2,7 +2,10 @@ ## Github Collaboration +Let's randomly assign the team member letter. The person who has the smaller number in their street address will be Team Member A (Ex: I live at 123 Maple Dr., and my partern lives at 5 Blueberry Ln. -- so my partner is Team Member A). + #### Team Member A +- You will be the Github master for this task. - Share your screen with your partner - Create a Github repo called `team-github-practice` - Add team member B as a "Contributor". From 0e1d7daaba6bad13403d2bde2b785e1892ec0d5a Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 21:24:46 -0400 Subject: [PATCH 06/10] Update README.md --- unit_03/w08d04/morning_exercise/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit_03/w08d04/morning_exercise/README.md b/unit_03/w08d04/morning_exercise/README.md index f8ab0b2..1bfd8ba 100644 --- a/unit_03/w08d04/morning_exercise/README.md +++ b/unit_03/w08d04/morning_exercise/README.md @@ -2,7 +2,7 @@ ## Github Collaboration -Let's randomly assign the team member letter. The person who has the smaller number in their street address will be Team Member A (Ex: I live at 123 Maple Dr., and my partern lives at 5 Blueberry Ln. -- so my partner is Team Member A). +Let's randomly assign the team member letter. The person who has the smaller number in their street address will be Team Member A (Ex: I live at 123 Maple Dr., and my partner lives at 5 Blueberry Ln. -- so my partner is Team Member A). #### Team Member A - You will be the Github master for this task. From 6b86de0a5d8b563d3352a4a3f924472a313631d5 Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 21:29:15 -0400 Subject: [PATCH 07/10] Update README.md --- unit_03/w08d04/morning_exercise/README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/unit_03/w08d04/morning_exercise/README.md b/unit_03/w08d04/morning_exercise/README.md index 1bfd8ba..51accdd 100644 --- a/unit_03/w08d04/morning_exercise/README.md +++ b/unit_03/w08d04/morning_exercise/README.md @@ -1,3 +1,19 @@ +![ga](http://mobbook.generalassemb.ly/ga_cog.png) + +# WDI-PANTHALASSA + +--- +Title: Github Collaboration & Branching
+Type: Morning Exercise
+Duration: "0:45"
+Creator:
+ Original creator: Kristyn Bryan
+ Course: WDIr Panthalassa
+Competencies: Github
+Prerequisites: none
+ +--- + # Morning Exercise ## Github Collaboration From 131acf7373d97987616edbe9a6fd6871ad75a8f6 Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 22:16:33 -0400 Subject: [PATCH 08/10] Create daily_tracker.md --- unit_03/w08d04/morning_exercise/daily_tracker.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 unit_03/w08d04/morning_exercise/daily_tracker.md diff --git a/unit_03/w08d04/morning_exercise/daily_tracker.md b/unit_03/w08d04/morning_exercise/daily_tracker.md new file mode 100644 index 0000000..ba54c52 --- /dev/null +++ b/unit_03/w08d04/morning_exercise/daily_tracker.md @@ -0,0 +1,15 @@ +![ga](http://mobbook.generalassemb.ly/ga_cog.png) + +# WDI-PANTHALASSA + +--- +Title: Daily Project Tracker
+Type: Afternoon Exercise
+Duration: "0:45"
+Creator:
+ Original creator: Kristyn Bryan
+ Course: WDIr Panthalassa
+Competencies: Trello & Github
+Prerequisites: none
+ +--- From fa7dd93dd9ef3269c19f980b879b427f55dd0c38 Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 22:18:02 -0400 Subject: [PATCH 09/10] Update daily_tracker.md --- unit_03/w08d04/morning_exercise/daily_tracker.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/unit_03/w08d04/morning_exercise/daily_tracker.md b/unit_03/w08d04/morning_exercise/daily_tracker.md index ba54c52..0152b34 100644 --- a/unit_03/w08d04/morning_exercise/daily_tracker.md +++ b/unit_03/w08d04/morning_exercise/daily_tracker.md @@ -13,3 +13,13 @@ Competencies: Trello & Github
Prerequisites: none
--- + +USER STORIES + +Create a daily plan of action in Github issues +Use labels +Stretch: Use Milestones + +Create a daily plan of action in Trello +Use labels +Stretch: Add stickers From 19665c2c767616f014a1248c78684ccce3c16cbf Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Thu, 7 Jul 2016 12:29:05 -0400 Subject: [PATCH 10/10] Update daily_tracker.md --- unit_03/w08d04/morning_exercise/daily_tracker.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unit_03/w08d04/morning_exercise/daily_tracker.md b/unit_03/w08d04/morning_exercise/daily_tracker.md index 0152b34..3a4a05f 100644 --- a/unit_03/w08d04/morning_exercise/daily_tracker.md +++ b/unit_03/w08d04/morning_exercise/daily_tracker.md @@ -13,7 +13,9 @@ Competencies: Trello & Github
Prerequisites: none
--- +# Dialy Tracker for Project Work +Beginning with Project 3, you will be asked to create a daily tracker for your work. USER STORIES Create a daily plan of action in Github issues