When you have resolved this problem, run “git rebase –continue”.
If you prefer to skip this patch, run “git rebase –skip” instead.
To check out the original branch and stop rebasing, run “git rebase –abort”.

(Corrigeer bestand Changesl.sql)

git rebase --continue

Changes.sql: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add

git status

rebase in progress; onto 4df07f6
You are currently rebasing branch ‘dev’ on ‘4df07f6’.
(fix conflicts and then run “git rebase –continue”)
(use “git rebase –skip” to skip this patch)
(use “git rebase –abort” to check out the original branch)

Applying: correct quote signs in changes.sql
No changes – did you forget to use ‘git add’?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

When you have resolved this problem, run “git rebase –continue”.
If you prefer to skip this patch, run “git rebase –skip” instead.
To check out the original branch and stop rebasing, run “git rebase –abort”.