Adding the add step to rebasing

in README, adding the step `git add` for marking files as resolved
before continuing with rebase
This commit is contained in:
DroidX86 2017-07-05 17:35:05 +05:30
parent e0c83f7d33
commit 242ecf1d28

View File

@ -42,6 +42,7 @@ We use [Feature-branch-workflow](https://www.atlassian.com/git/tutorials/compari
```
* If you dont 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