Quando executei o comando rebase master desenvolvimento apresentou o seguinte erro
git rebase master desenvolvimento
First, rewinding head to replay your work on top of it...
Applying: titulo do site
.git/rebase-apply/patch:15: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in proposta_1.html
Auto-merging proposta_1.html
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 titulo do site
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", 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".Isso não aconteceu na aula, o que eu preciso fazer para continuar?
Desde já agradeço.
