From 63a7cd066d9af0a5f1bfbdd8153c0f5d380e2b1a Mon Sep 17 00:00:00 2001 From: Ochi Ryota Date: Wed, 2 Aug 2017 12:04:33 +0900 Subject: [PATCH 1/4] change README.md --- README.md | 121 ------------------------------------------------------ 1 file changed, 121 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 78871dd..0000000 --- a/README.md +++ /dev/null @@ -1,121 +0,0 @@ -training-git -============ -This guide is written around the [gitflow workflow](http://nvie.com/posts/a-successful-git-branching-model/) using -GitHub and will cover some basic training topics (Pull requests, conflicts etc). - - -Setting Up ----------- -Before we can begin with our tutorial, there is a bit of setup involved to help us along the way. - -#### Fork -Please fork this repository by clicking the `Fork` button on the top right hand side - -#### Clone -Once the project has been forked, proceed by cloning the repository - -`git clone ssh://git@github.com/YOURNAME/training_git` - -#### Add Upstream -To be able to pull in changes from the blessed repo we need to add it as an upstream - -`git remote add upstream ssh://git@github.com/Wizcorp/training_git.git` - - -First Pull Request ------------------- -Here we will take you through the pull request process and have you perform your first pull request. What you will be -doing for your first fix is to update the title of this README file `training-git` to `Training - GIT`. Please follow -the following instruction set to get to the PR review stages: - -#### Branch -Create a branch dedicated to your fix, branching it from the master branch - -`git branch feature/titleFix master` - -#### Checkout -Now that the branch has been created, you will need to check it out to make changes - -`git checkout feature/titleFix` - -#### Modify -From this point you can begin making changes, please alter the `README.md` file title to `Training - GIT` - -#### Status -Before we begin committing our work, let's take a quick look at the status of the project - -`git status` - -#### Stage -We now have to commit our work, so firstly we need to stage the changes - -`git add README.md` - -#### Commit -And then we commit it - -`git commit -m "YOUR COMMIT MESSAGE HERE"` - -#### Pull -At this point we should usually pull in any changes that may have occurred in the meantime on the master branch - -`git pull upstream master` - -#### Push -Then we push the branch up to our fork creating the branch on the remote - -`git push origin feature/titleFix` - -#### Pull Request -Lastly we initiate a pull request to the origin blessed repository using the `Pull Request` button from your fork - - -First Conflict --------------- -Here we will help you face and resolve a git conflict by trying to simulate the situation. We have the following -sentence `She sells sea-shells on the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` -as opposed to `on the sea-shore`. - -#### Branch - -`git branch feature/sentenceFix master` - -#### Checkout - -`git checkout feature/sentenceFix` - -#### Modify -Modify the above sentence as written there. - -#### Status - -`git status` - -#### Stage - -`git add README.md` - -#### Commit - -`git commit -m "YOUR COMMIT MESSAGE HERE"` - -#### Pull -Here to simulate the conflict resolution we will pull from a different upstream branch `conflict` - -`git pull upstream conflict` - -#### Conflict Resolution -You should now be faced with a conflict. You can quickly check which files contain a conflict by taking a look at this -project `status`. When you open the file you should notice a section wrapped by `<<<<<`, `=====` and`>>>>>`. The goal is -to remove one or merge then together into one. Once you have resolved the conflict, removed the encapsulation text -`<<<<<`, `=====` and`>>>>>`. - -#### Stage - -#### Commit - -#### Push - -`git push origin feature/sentenceFix` - -#### Pull Request From 2a2c910b7a04f6e0d178a028acaa92576733f121 Mon Sep 17 00:00:00 2001 From: Ochi Ryota Date: Wed, 2 Aug 2017 12:18:52 +0900 Subject: [PATCH 2/4] change README.md --- Training-GIT | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 Training-GIT diff --git a/Training-GIT b/Training-GIT new file mode 100644 index 0000000..78871dd --- /dev/null +++ b/Training-GIT @@ -0,0 +1,121 @@ +training-git +============ +This guide is written around the [gitflow workflow](http://nvie.com/posts/a-successful-git-branching-model/) using +GitHub and will cover some basic training topics (Pull requests, conflicts etc). + + +Setting Up +---------- +Before we can begin with our tutorial, there is a bit of setup involved to help us along the way. + +#### Fork +Please fork this repository by clicking the `Fork` button on the top right hand side + +#### Clone +Once the project has been forked, proceed by cloning the repository + +`git clone ssh://git@github.com/YOURNAME/training_git` + +#### Add Upstream +To be able to pull in changes from the blessed repo we need to add it as an upstream + +`git remote add upstream ssh://git@github.com/Wizcorp/training_git.git` + + +First Pull Request +------------------ +Here we will take you through the pull request process and have you perform your first pull request. What you will be +doing for your first fix is to update the title of this README file `training-git` to `Training - GIT`. Please follow +the following instruction set to get to the PR review stages: + +#### Branch +Create a branch dedicated to your fix, branching it from the master branch + +`git branch feature/titleFix master` + +#### Checkout +Now that the branch has been created, you will need to check it out to make changes + +`git checkout feature/titleFix` + +#### Modify +From this point you can begin making changes, please alter the `README.md` file title to `Training - GIT` + +#### Status +Before we begin committing our work, let's take a quick look at the status of the project + +`git status` + +#### Stage +We now have to commit our work, so firstly we need to stage the changes + +`git add README.md` + +#### Commit +And then we commit it + +`git commit -m "YOUR COMMIT MESSAGE HERE"` + +#### Pull +At this point we should usually pull in any changes that may have occurred in the meantime on the master branch + +`git pull upstream master` + +#### Push +Then we push the branch up to our fork creating the branch on the remote + +`git push origin feature/titleFix` + +#### Pull Request +Lastly we initiate a pull request to the origin blessed repository using the `Pull Request` button from your fork + + +First Conflict +-------------- +Here we will help you face and resolve a git conflict by trying to simulate the situation. We have the following +sentence `She sells sea-shells on the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` +as opposed to `on the sea-shore`. + +#### Branch + +`git branch feature/sentenceFix master` + +#### Checkout + +`git checkout feature/sentenceFix` + +#### Modify +Modify the above sentence as written there. + +#### Status + +`git status` + +#### Stage + +`git add README.md` + +#### Commit + +`git commit -m "YOUR COMMIT MESSAGE HERE"` + +#### Pull +Here to simulate the conflict resolution we will pull from a different upstream branch `conflict` + +`git pull upstream conflict` + +#### Conflict Resolution +You should now be faced with a conflict. You can quickly check which files contain a conflict by taking a look at this +project `status`. When you open the file you should notice a section wrapped by `<<<<<`, `=====` and`>>>>>`. The goal is +to remove one or merge then together into one. Once you have resolved the conflict, removed the encapsulation text +`<<<<<`, `=====` and`>>>>>`. + +#### Stage + +#### Commit + +#### Push + +`git push origin feature/sentenceFix` + +#### Pull Request From 85b02ef226007ddb4b07dd95542564d33af232a9 Mon Sep 17 00:00:00 2001 From: Ochi Ryota Date: Wed, 2 Aug 2017 12:22:54 +0900 Subject: [PATCH 3/4] title-change --- README.md | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..d324a7f --- /dev/null +++ b/README.md @@ -0,0 +1,121 @@ +Training-GIT +============ +This guide is written around the [gitflow workflow](http://nvie.com/posts/a-successful-git-branching-model/) using +GitHub and will cover some basic training topics (Pull requests, conflicts etc). + + +Setting Up +---------- +Before we can begin with our tutorial, there is a bit of setup involved to help us along the way. + +#### Fork +Please fork this repository by clicking the `Fork` button on the top right hand side + +#### Clone +Once the project has been forked, proceed by cloning the repository + +`git clone ssh://git@github.com/YOURNAME/training_git` + +#### Add Upstream +To be able to pull in changes from the blessed repo we need to add it as an upstream + +`git remote add upstream ssh://git@github.com/Wizcorp/training_git.git` + + +First Pull Request +------------------ +Here we will take you through the pull request process and have you perform your first pull request. What you will be +doing for your first fix is to update the title of this README file `training-git` to `Training - GIT`. Please follow +the following instruction set to get to the PR review stages: + +#### Branch +Create a branch dedicated to your fix, branching it from the master branch + +`git branch feature/titleFix master` + +#### Checkout +Now that the branch has been created, you will need to check it out to make changes + +`git checkout feature/titleFix` + +#### Modify +From this point you can begin making changes, please alter the `README.md` file title to `Training - GIT` + +#### Status +Before we begin committing our work, let's take a quick look at the status of the project + +`git status` + +#### Stage +We now have to commit our work, so firstly we need to stage the changes + +`git add README.md` + +#### Commit +And then we commit it + +`git commit -m "YOUR COMMIT MESSAGE HERE"` + +#### Pull +At this point we should usually pull in any changes that may have occurred in the meantime on the master branch + +`git pull upstream master` + +#### Push +Then we push the branch up to our fork creating the branch on the remote + +`git push origin feature/titleFix` + +#### Pull Request +Lastly we initiate a pull request to the origin blessed repository using the `Pull Request` button from your fork + + +First Conflict +-------------- +Here we will help you face and resolve a git conflict by trying to simulate the situation. We have the following +sentence `She sells sea-shells on the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` +as opposed to `on the sea-shore`. + +#### Branch + +`git branch feature/sentenceFix master` + +#### Checkout + +`git checkout feature/sentenceFix` + +#### Modify +Modify the above sentence as written there. + +#### Status + +`git status` + +#### Stage + +`git add README.md` + +#### Commit + +`git commit -m "YOUR COMMIT MESSAGE HERE"` + +#### Pull +Here to simulate the conflict resolution we will pull from a different upstream branch `conflict` + +`git pull upstream conflict` + +#### Conflict Resolution +You should now be faced with a conflict. You can quickly check which files contain a conflict by taking a look at this +project `status`. When you open the file you should notice a section wrapped by `<<<<<`, `=====` and`>>>>>`. The goal is +to remove one or merge then together into one. Once you have resolved the conflict, removed the encapsulation text +`<<<<<`, `=====` and`>>>>>`. + +#### Stage + +#### Commit + +#### Push + +`git push origin feature/sentenceFix` + +#### Pull Request From bf7412d8c8564b03acd6dd1d21b04b317c5759ce Mon Sep 17 00:00:00 2001 From: imaharu Date: Wed, 2 Aug 2017 12:46:20 +0900 Subject: [PATCH 4/4] Delete Training-GIT --- Training-GIT | 121 --------------------------------------------------- 1 file changed, 121 deletions(-) delete mode 100644 Training-GIT diff --git a/Training-GIT b/Training-GIT deleted file mode 100644 index 78871dd..0000000 --- a/Training-GIT +++ /dev/null @@ -1,121 +0,0 @@ -training-git -============ -This guide is written around the [gitflow workflow](http://nvie.com/posts/a-successful-git-branching-model/) using -GitHub and will cover some basic training topics (Pull requests, conflicts etc). - - -Setting Up ----------- -Before we can begin with our tutorial, there is a bit of setup involved to help us along the way. - -#### Fork -Please fork this repository by clicking the `Fork` button on the top right hand side - -#### Clone -Once the project has been forked, proceed by cloning the repository - -`git clone ssh://git@github.com/YOURNAME/training_git` - -#### Add Upstream -To be able to pull in changes from the blessed repo we need to add it as an upstream - -`git remote add upstream ssh://git@github.com/Wizcorp/training_git.git` - - -First Pull Request ------------------- -Here we will take you through the pull request process and have you perform your first pull request. What you will be -doing for your first fix is to update the title of this README file `training-git` to `Training - GIT`. Please follow -the following instruction set to get to the PR review stages: - -#### Branch -Create a branch dedicated to your fix, branching it from the master branch - -`git branch feature/titleFix master` - -#### Checkout -Now that the branch has been created, you will need to check it out to make changes - -`git checkout feature/titleFix` - -#### Modify -From this point you can begin making changes, please alter the `README.md` file title to `Training - GIT` - -#### Status -Before we begin committing our work, let's take a quick look at the status of the project - -`git status` - -#### Stage -We now have to commit our work, so firstly we need to stage the changes - -`git add README.md` - -#### Commit -And then we commit it - -`git commit -m "YOUR COMMIT MESSAGE HERE"` - -#### Pull -At this point we should usually pull in any changes that may have occurred in the meantime on the master branch - -`git pull upstream master` - -#### Push -Then we push the branch up to our fork creating the branch on the remote - -`git push origin feature/titleFix` - -#### Pull Request -Lastly we initiate a pull request to the origin blessed repository using the `Pull Request` button from your fork - - -First Conflict --------------- -Here we will help you face and resolve a git conflict by trying to simulate the situation. We have the following -sentence `She sells sea-shells on the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` -as opposed to `on the sea-shore`. - -#### Branch - -`git branch feature/sentenceFix master` - -#### Checkout - -`git checkout feature/sentenceFix` - -#### Modify -Modify the above sentence as written there. - -#### Status - -`git status` - -#### Stage - -`git add README.md` - -#### Commit - -`git commit -m "YOUR COMMIT MESSAGE HERE"` - -#### Pull -Here to simulate the conflict resolution we will pull from a different upstream branch `conflict` - -`git pull upstream conflict` - -#### Conflict Resolution -You should now be faced with a conflict. You can quickly check which files contain a conflict by taking a look at this -project `status`. When you open the file you should notice a section wrapped by `<<<<<`, `=====` and`>>>>>`. The goal is -to remove one or merge then together into one. Once you have resolved the conflict, removed the encapsulation text -`<<<<<`, `=====` and`>>>>>`. - -#### Stage - -#### Commit - -#### Push - -`git push origin feature/sentenceFix` - -#### Pull Request