From 3cfad385d607f0f605cc3a0932a3cd7e05b88b92 Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Wed, 6 Jul 2016 21:02:50 -0400 Subject: [PATCH] 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` +-