Skip to content

Feature/sentence fix #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AtsushiYamashita wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/sentence fix #19

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56cb3c9
Conflicting commit
AlmirKadric Sep 9, 2014
828edb1
test
AtsushiYamashita Jun 1, 2017
2bede09
conflict test
AtsushiYamashita Jun 1, 2017
deb7941
conflict test
AtsushiYamashita Jun 1, 2017
d799eac
clear conflict
AtsushiYamashita Jun 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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).
Expand Down Expand Up @@ -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

Expand Down