From 1ff8a89d9f1f3a5aada5a017b9b9e8a03155c9f3 Mon Sep 17 00:00:00 2001 From: metaclassing <1027733+metaclassing@users.noreply.github.com> Date: Mon, 18 Mar 2019 09:28:05 -0500 Subject: [PATCH] Update README.md --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1966e78..53e0576 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # Cake What's it take to bake a pretty cake? -# Exercise 1 -## First you will each be assigned an ingredient: +## Exercise 1 +### First you will each be assigned an ingredient: * flour * sugar * fats (milk, butter, etc) -## Steps +### Steps 1) You will clone this repository 2) Create a new feature branch for your ingredient 3) Add ONLY YOUR ingredient to the ingredients.txt file: @@ -22,13 +22,13 @@ What's it take to bake a pretty cake? ``` 4) Commit your new branch and push it up to github 5) Create a pull request against master -## I will merge your PRs in the order they were created +### I will merge your PRs in the order they were created * You will have to fix PRs with perge conflicts -# Exercise 2 -## We will do the same thing as exercise 1 for the instructions +## Exercise 2 +### We will do the same thing as exercise 1 for the instructions * You have the same ingredients assigned -## Steps +### Steps 1) You will clone (or pull from) this repository 2) Create a new feature branch for your instruction 3) Add ONLY YOUR instruction to the instructions.txt file: @@ -44,10 +44,10 @@ make andrew do all the dishes ``` 4) Commit your new branch and push it up to github 5) create a pull request against the master -## I will merge your PRs in the order they were created +### I will merge your PRs in the order they were created * You will have to fix PRs with perge conflicts -# Conclusion +## Conclusion * In exercise 1 git is very good at merging simultanious changes on different lines * In exercise 2 git is slightly less good at merging changes on the same line * Temporary feature branches (github flow) is the defacto standard for most modern projects