From 071094023b6a6636a9ffce4efa30c492a3541671 Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Thu, 30 Jun 2016 16:00:41 -0400 Subject: [PATCH] Update GithubBranches.md --- unit_03/w07d05/student_labs/GithubBranches.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/unit_03/w07d05/student_labs/GithubBranches.md b/unit_03/w07d05/student_labs/GithubBranches.md index 101b28a..7ab0e2e 100644 --- a/unit_03/w07d05/student_labs/GithubBranches.md +++ b/unit_03/w07d05/student_labs/GithubBranches.md @@ -4,8 +4,17 @@ For your third project, you will not be working alone... this means that you will need to use Github branches! +### Watch this + Watch this ten minute video which will show you what it will look like when you make changes to the same file as someone else, how to deal with merge issues, how to commit your changes, and how to ask for a pull request. https://www.youtube.com/watch?v=oFYyTZwMyAg -Then, follow this tutorial to put your fingers to the task: +### Read this + +Read this instructional guide on branching. The beginning of this guide covers adds and commits (which you're familair with), but read it through - you will get a more detailed understanding of what you're doing with github: +http://rogerdudler.github.io/git-guide/ +### Do this + +Then, follow this tutorial to put your fingers to the task: +http://rogerdudler.github.io/git-guide/