From 56cb3c99fa612ca189c82c9f37ba9c320ab9a2f1 Mon Sep 17 00:00:00 2001 From: Almir Kadric Date: Tue, 9 Sep 2014 19:09:19 +0900 Subject: [PATCH 1/4] Conflicting commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e9c25b..a2c50bd 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Lastly we initiate a pull request to the origin blessed repository using the `Pu 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` +sentence `She sells sea-shells at the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` as opposed to `on the sea-shore`. ### Branch From 828edb17e89188a61e695039e3bc431ba65f0056 Mon Sep 17 00:00:00 2001 From: Atsushi Date: Thu, 1 Jun 2017 12:48:03 +0900 Subject: [PATCH 2/4] test --- 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 2bede092afbcb78d4b7c593fb0bc35424dde628c Mon Sep 17 00:00:00 2001 From: Atsushi Date: Thu, 1 Jun 2017 14:55:03 +0900 Subject: [PATCH 3/4] conflict test --- 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..32fe865 --- /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 by the seashore.`. What we will do is modify this sentence to contain `by the seashore` +as opposed to `by the seashore`. + +#### 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 d799eac2990c69e5dd31a514f347f6325b81e061 Mon Sep 17 00:00:00 2001 From: Atsushi Date: Thu, 1 Jun 2017 15:04:28 +0900 Subject: [PATCH 4/4] clear conflict --- README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.md b/README.md index f455c54..27eb1e4 100644 --- a/README.md +++ b/README.md @@ -73,18 +73,9 @@ Lastly we initiate a pull request to the origin blessed repository using the `Pu First Conflict -------------- Here we will help you face and resolve a git conflict by trying to simulate the situation. We have the following -<<<<<<< HEAD sentence `She sells sea-shells by the seashore.`. What we will do is modify this sentence to contain `by the seashore` as opposed to `by the seashore`. -#### Branch -======= -sentence `She sells sea-shells at the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` -as opposed to `on the sea-shore`. ->>>>>>> 56cb3c99fa612ca189c82c9f37ba9c320ab9a2f1 - -`git branch feature/sentenceFix master` - #### Checkout `git checkout feature/sentenceFix`