Хочу подтянуть ветку develop в feature. Из feature делаю
git rebase develop
Получаю сообщение о конфликте
First, rewinding head to replay your work on top of it...
Applying: feature-8905
Using index info to reconstruct a base tree...
M src/.source/packages
Falling back to patching base and 3-way merge...
Auto-merging src/.source/packages
CONFLICT (content): Merge conflict in src/.source/packages
error: Failed to merge in the changes.
Patch failed at 0001 feature-8905
Use 'git am --show-current-patch' to see the failed patch
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".
правлю руками конфликтный файл, запускаю
git rebase --continue
Получаю
src/.source/packages: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
Дальше запускаю
git add .source/packages
Вроде все ок, git status
rebase in progress; onto e3a6baf
You are currently rebasing branch 'feature-11' on 'e3a6baf'.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working tree clean
Выполняю
git rebase --continue
и в итоге
Applying: feature-8905
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.
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".
если сейчас глянуть статус то rebase не завершен
rebase in progress; onto e3a6baf
You are currently rebasing branch 'feature-11' on 'e3a6baf'.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working tree clean
