Skip to content

Commit aa88edc

Browse files
warberUnseenWizzard
warber
authored andcommitted
fixed duplicated wording in README.md
1 parent 8a0d22b commit aa88edc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ If you now switch back to master (`git checkout master`) and do `git merge chang
351351

352352
The new commit introduces the changes that we've made on the `change_alice` branch into master.
353353

354-
As you'll remember from before, revisions in git, aren't only a snapshot of your files but also contain information on where they came from from. Each `commit` has one or more parent commits. Our new `merge` commit, has both the last commit from _master_ and the commit we made on the other branch as its parents.
354+
As you'll remember from before, revisions in git, aren't only a snapshot of your files but also contain information on where they came from. Each `commit` has one or more parent commits. Our new `merge` commit, has both the last commit from _master_ and the commit we made on the other branch as its parents.
355355

356356
### Resolving conflicts
357357

0 commit comments

Comments
 (0)