Hello guys.
I got strange file.
I've cherry-picked the commit.
And Git says :
error: could not apply 9693f23... [TESTBackup_KK][AAAtest01] TESTBackup
AAA-test014.0 and test014.1 organize folder
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
error: Could not open test014_1/TESTBackup_000_COM.apk
error: Could not open test014_1/TESTBackup_000_COM_Black.apk
error: Could not open test014_1/TESTBackup_000_COM_NO_ICON.apk
error: Could not open test014_1/TESTBackup_000_COM_NO_ICON_Black.apk
error: Could not open test014_1/docs/TESTBackup_11_Option_Sheet_v2.6.xlsx
error: Could not open test014_1/docs/TESTBackup_11_Release_Note_v1.2.xlsx
And I have:
> git status
Not currently on any branch.
You are currently cherry-picking commit 9693f23.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both added: test014_1/TESTBackup_000_COM.apk
both added: test014_1/TESTBackup_000_COM_Black.apk
both added: test014_1/TESTBackup_000_COM_NO_ICON.apk
both added: test014_1/TESTBackup_000_COM_NO_ICON_Black.apk
both added:
test014_1/docs/TESTBackup_4.4.19_Option_Sheet_v2.6.xlsx
both added:
test014_1/docs/TESTBackup_4.4.19_Release_Note_v1.2.xlsx
Untracked files:
(use "git add <file>..." to include in what will be committed)
test014_1/TESTBackup_000_COM.apk~9693f23...
[TESTBackup_KK][AAAtest01] TESTBackup AAA-test014.0 and test014.1 organize
folder
test014_1/TESTBackup_000_COM.apk~HEAD
test014_1/TESTBackup_000_COM_Black.apk~9693f23...
[TESTBackup_KK][AAAtest01] TESTBackup AAA-test014.0 and test014.1 organize
folder
test014_1/TESTBackup_000_COM_Black.apk~HEAD
test014_1/TESTBackup_000_COM_NO_ICON.apk~9693f23...
[TESTBackup_KK][AAAtest01] TESTBackup AAA-test014.0 and test014.1 organize
folder
test014_1/TESTBackup_000_COM_NO_ICON.apk~HEAD
test014_1/TESTBackup_000_COM_NO_ICON_Black.apk~9693f23...
[TESTBackup_KK][AAAtest01] TESTBackup AAA-test014.0 and test014.1 organize
folder
test014_1/TESTBackup_000_COM_NO_ICON_Black.apk~HEAD
test014_1/docs/TESTBackup_4.4.19_Option_Sheet_v2.6.xlsx~9693f23...
[TESTBackup_KK][AAAtest01] TESTBackup AAA-test014.0 and test014.1 organize
folder
test014_1/docs/TESTBackup_4.4.19_Option_Sheet_v2.6.xlsx~HEAD
test014_1/docs/TESTBackup_4.4.19_Release_Note_v1.2.xlsx~9693f23...
[TESTBackup_KK][AAAtest01] TESTBackup AAA-test014.0 and test014.1 organize
folder
test014_1/docs/TESTBackup_4.4.19_Release_Note_v1.2.xlsx~HEAD
Why this untracked files occurs?
And How can I resolve this?
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
