From c4301a81b47d8357dd8ad4d93eb808ad5a4e25cf Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Wed, 25 Nov 2015 20:50:38 +0000 Subject: [PATCH 1/6] extra comment at the end --- readme.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index a33e89f..606fd0a 100644 --- a/readme.md +++ b/readme.md @@ -16,7 +16,6 @@ Once you have the repo on your machine you will want to create a new branch to c ``` $ git checkout -b [new-branch-name] - ``` This branch is where all your code amends will live untill merged in. @@ -33,13 +32,11 @@ $ git add [file-name-you-changed] $ git commit -m 'Here you can put a message of the changes you made' $ git push -u origin [branch-name] - ``` If you have made multiple file amends you may want to do the following to add many files: ``` $ git add . - ``` ### Creating the pull request @@ -48,4 +45,6 @@ Now that your code is pushed to origin you can do the pull request. Navigate to the page of the repository, in this case the original [codebar blog page](https://github.com/codebar/blog). You should see a green prompt at the top of the page asking you to 'compare and pull request', click that prompt. You will then be navigated to a page that will ask you to describe what you did in the pull request, and the original branch that you are comparing against. Complete all of these required fields and click 'create pull request'. -###Congratulations you have just done your first pull request :) +###Congratulations you have just done your first pull request :) + +## You may want to refer to this [file](https://github.com/KimberleyCook/git-commands) for more git commands throughout the day. From dfb5771747d85b3f1b016b7556eae69054c12163 Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Wed, 25 Nov 2015 20:51:23 +0000 Subject: [PATCH 2/6] extra hash on final sentance oops --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 606fd0a..1ee0727 100644 --- a/readme.md +++ b/readme.md @@ -47,4 +47,4 @@ Navigate to the page of the repository, in this case the original [codebar blog ###Congratulations you have just done your first pull request :) -## You may want to refer to this [file](https://github.com/KimberleyCook/git-commands) for more git commands throughout the day. +#### You may want to refer to this [file](https://github.com/KimberleyCook/git-commands) for more git commands throughout the day. From 4c99e129ec76cf33ccdddaf19f8cbb1a215a17cf Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Fri, 4 Dec 2015 11:22:24 +0000 Subject: [PATCH 3/6] workshop amend to suit new post in blog repo --- readme.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 1ee0727..6c1b424 100644 --- a/readme.md +++ b/readme.md @@ -8,11 +8,19 @@ The purpose of Git is to manage a project, or a set of files, as they change ove Forking a repo allows you to freely experiment with changes without affecting the original project. Most commonly, forks are used to either propose changes to someone else's project or to use someone else's project as a starting point for your own idea. -Go onto the [codebar blog](https://github.com/codebar/blog) and fork the repo into a folder on your machine. +Go onto the [codebar blog](https://github.com/codebar/blog) and fork the repo (top right of the webpage) into a folder on your machine. + +Once this is forked onto your machine you will need to pull the **24PR-workshop-post** branch. To do this: + +``` +$ git checkout -b 24PR-workshop-post origin/24PR-workshop-post +``` + +This is pulling down a branch that is currently not merged into master. ##Creating a new branch -Once you have the repo on your machine you will want to create a new branch to change some code. +You will now neeed to create your own banch yso that you can change some code. ``` $ git checkout -b [new-branch-name] @@ -22,7 +30,7 @@ This branch is where all your code amends will live untill merged in. ### Adding/Committing and pushing -For this tutorial there is a file in source/posts/[file to change], please add your name and a little paragraph about your coding experience to date. +For this tutorial there is a file `source/posts/2015-12-04-24-pull-requests.markdown`, please add your name and a little paragraph about your coding experience to date. In order for your changed code to be visible to the original developer you will need to add your changes to your local repo, commit them to the local repo then push them to the remote(original) repo. From 9fc7bd617fc974a016a72456c8e90f8c11b434b8 Mon Sep 17 00:00:00 2001 From: Kimberley Date: Fri, 4 Dec 2015 12:46:42 +0000 Subject: [PATCH 4/6] Update readme.md --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 6c1b424..090bca3 100644 --- a/readme.md +++ b/readme.md @@ -16,11 +16,11 @@ Once this is forked onto your machine you will need to pull the **24PR-workshop- $ git checkout -b 24PR-workshop-post origin/24PR-workshop-post ``` -This is pulling down a branch that is currently not merged into master. +This pulls down a branch that is currently not merged into master. ##Creating a new branch -You will now neeed to create your own banch yso that you can change some code. +You will now need to create your own banch that you can change some code on. ``` $ git checkout -b [new-branch-name] From 3f27607ec53edef8690818967ac6a9d25e334c45 Mon Sep 17 00:00:00 2001 From: Richard Westenra Date: Sat, 5 Dec 2015 14:20:11 +0000 Subject: [PATCH 5/6] Make the forking instructions clearer Updated readme.md to separate forking and cloning, to make the process clearer. --- readme.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 090bca3..747aa0d 100644 --- a/readme.md +++ b/readme.md @@ -8,9 +8,15 @@ The purpose of Git is to manage a project, or a set of files, as they change ove Forking a repo allows you to freely experiment with changes without affecting the original project. Most commonly, forks are used to either propose changes to someone else's project or to use someone else's project as a starting point for your own idea. -Go onto the [codebar blog](https://github.com/codebar/blog) and fork the repo (top right of the webpage) into a folder on your machine. +Go onto the [codebar blog](https://github.com/codebar/blog) and fork the repo (top right of the webpage). This will create a copy of the repo on your own Github account, at github.com/[YourUserName]/blog. -Once this is forked onto your machine you will need to pull the **24PR-workshop-post** branch. To do this: +Once this is done, you'll need to clone your forked repo into a folder on your machine so you can work on it: + +``` +$ git clone https://github.com/[YourUserName]/blog.git +``` + +Once this is cloned onto your machine you will need to open the `blog` folder and pull the **24PR-workshop-post** branch. To do this: ``` $ git checkout -b 24PR-workshop-post origin/24PR-workshop-post From 8ff60ce3782fea5adbe5d238a3e38cf168aba526 Mon Sep 17 00:00:00 2001 From: Niamh <40704610+niamhmccoo@users.noreply.github.com> Date: Sat, 1 Dec 2018 15:39:55 +0000 Subject: [PATCH 6/6] Update readme.md --- readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index 747aa0d..000e0d2 100644 --- a/readme.md +++ b/readme.md @@ -1,10 +1,10 @@ # Git Workshop for 24 Pull Requests -###Repository +### Repository The purpose of Git is to manage a project, or a set of files, as they change over time. Git stores this information in a data structure called a repository, commonly shortened to repo. -###Forking +### Forking Forking a repo allows you to freely experiment with changes without affecting the original project. Most commonly, forks are used to either propose changes to someone else's project or to use someone else's project as a starting point for your own idea. @@ -24,7 +24,7 @@ $ git checkout -b 24PR-workshop-post origin/24PR-workshop-post This pulls down a branch that is currently not merged into master. -##Creating a new branch +## Creating a new branch You will now need to create your own banch that you can change some code on. @@ -59,6 +59,6 @@ Now that your code is pushed to origin you can do the pull request. Navigate to the page of the repository, in this case the original [codebar blog page](https://github.com/codebar/blog). You should see a green prompt at the top of the page asking you to 'compare and pull request', click that prompt. You will then be navigated to a page that will ask you to describe what you did in the pull request, and the original branch that you are comparing against. Complete all of these required fields and click 'create pull request'. -###Congratulations you have just done your first pull request :) +### Congratulations you have just done your first pull request :) #### You may want to refer to this [file](https://github.com/KimberleyCook/git-commands) for more git commands throughout the day.