From dc521baa00f2c1d456cd48f1f17dd89dc9da58eb Mon Sep 17 00:00:00 2001 From: Matt Watson Date: Sat, 13 Jan 2018 11:22:18 -0500 Subject: [PATCH] Adds an 's' to conflict, and adds a comma. (#106) The new sentence would read "If you don't have conflicts, skip this step." --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1fa4745..97566bc 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ Because of most of the reasons above, we use [Feature-branch-workflow](https://w _Why:_ > You can use --autosquash to squash all your commits to a single commit. Nobody wants many commits for a single feature in develop branch. [read more...](https://robots.thoughtbot.com/autosquashing-git-commits) -* If you don’t have conflict skip this step. If you have conflicts, [resolve them](https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/) and continue rebase. +* If you don’t have conflicts, skip this step. If you have conflicts, [resolve them](https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/) and continue rebase. ```sh git add ... git rebase --continue