sthope/gitea_templates
Template
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds an 's' to conflict, and adds a comma. (#106)

Browse Source 
The new sentence would read "If you don't have conflicts, skip this step."
This commit is contained in:
Matt Watson 2018-01-13 11:22:18 -05:00 committed by Vahid Panjganj
parent 3f6eb7b0ee
commit dc521baa00
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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 <file1> <file2> ...
git rebase --continue