Я пытаюсь перебазировать ветку и получаю конфликт, который не могу разрешить.
Я не могу добавить файлы - посмотрите код ниже. Попытка выполнить следующее безуспешно:
1) Использовано git commit -a
2) Очистить репо git explog expire --expire = now --all git g c --prune = now --aggressive
3) Обновлена git версия до git версия 2.25.0. windows .1
Система windows 10
Пожалуйста, сообщите
git rebase rot/Versions/V/V_RC -s recursive -X ours
interactive rebase in progress; onto 80c9f5ca78
Last commands done (21 commands done):
pick 64c1a47efd Updated V_RELEASE.xaml
pick df9fddlo38 Updated VersionInfo.xml
Next commands to do (1995 remaining commands):
pick 762170f237 Updated VersionsInfo.xml
pick df9fdd3839 -= Build 1 (Converters 2.0.1146.0) =-
You are currently rebasing branch 'V_RC' on '80c9f5ca78'.
Changes not staged for commit:
modified: SIB/data/Graphics/Posters/PIC Init Screen.jpg
modified: SIB/data/Graphics/Posters/PIC_CalibApplicLogin.jpg
no changes added to commit
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git cherry-pick --skip'
Could not apply df9fdd3839... Updated VersionInfo.xml
user@tmp MINGW64 /c/8RLB (V_RC|REBASE-i 21/2016)
$ GIT_TRACE=1 git add SIB/data/Graphics/Posters/PIC_CalibApplicLogin.jpg
15:30:08.519104 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/bin
15:30:08.519104 git.c:439 trace: built-in: git add SIB/data/Graphics/Posters/PIC_CalibApplicLogin.jpg
$ GIT_TRACE=1 git status
15:55:20.341682 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/bin
15:55:20.341682 git.c:439 trace: built-in: git status
interactive rebase in progress; onto 80c9f5ca78
Last commands done (21 commands done):
pick 64c1a47efd Updated V_RELEASE.xaml
pick df9fddlo38 Updated VersionInfo.xml
Next commands to do (1995 remaining commands):
pick 762170f237 Updated VersionsInfo.xml
pick df9fdd3839 -= Build 1 (Converters 2.0.1146.0) =-
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch 'V_RC' on '80c9f5ca78'.
(use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: SIB/data/Graphics/Posters/PIC Init Screen.jpg
modified: SIB/data/Graphics/Posters/PIC_CalibApplicLogin.jpg
no changes added to commit (use "git add" and/or "git commit -a")