Merge pull request #9 from DroidX86/master

Adding the add step to rebasing
2017-07-05 14:34:39 +01:00 · 2017-07-05 14:34:39 +01:00 · f4d0a234a1
commit f4d0a234a1
parent b3d89edb44 242ecf1d28
1 changed files with 1 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -42,6 +42,7 @@ We use [Feature-branch-workflow](https://www.atlassian.com/git/tutorials/compari
    ```
 * 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
    ```
+	git add <file1> <file2> ...
    git rebase --continue
    ```
 * Push your branch