diff --git a/README.md b/README.md index 78871dd..27eb1e4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -training-git +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). @@ -73,12 +73,8 @@ 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` -as opposed to `on the sea-shore`. - -#### Branch - -`git branch feature/sentenceFix master` +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`. #### Checkout