From 242ecf1d28de953776ee0f0efa44a7eecbc26e75 Mon Sep 17 00:00:00 2001 From: DroidX86 Date: Wed, 5 Jul 2017 17:35:05 +0530 Subject: [PATCH] Adding the add step to rebasing in README, adding the step `git add` for marking files as resolved before continuing with rebase --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 28e26c6..2959a03 100644 --- 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 ... git rebase --continue ``` * Push your branch