$ git rebase origin/master
First, rewinding head to replay your work on top of it…
Applying: second add from local
error: Failed to merge in the changes.
Using index info to reconstruct a base tree…
M rebase.md
Falling back to patching base and 3-way merge…
Auto-merging rebase.md
CONFLICT (content): Merge conflict in rebase.md
Patch failed at 0001 second add from local
The copy of the patch that failed is found in: .git/rebase-apply/patch

Resolve all conflicts manually, mark them as resolved with
“git add/rm “, then run “git rebase –continue”.
You can instead skip this commit: run “git rebase –skip”.
To abort and get back to the state before “git rebase”, run “git rebase –abort”.