{"thread":{"id":"28068","subject":"cherry-pick cannot merge binary files? (also strategy does not work?)","startedAt":"2011-08-11T12:58:34Z","lastAt":"2011-08-11T12:58:34Z","messageCount":1,"participants":["Piotr Krukowiecki"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"173283","messageId":"CAA01CsoMbSQr1u1JarH==5BTOxuDALu8wAvzizW232JAWgyr8g@mail.gmail.com","threadId":"28068","inReplyTo":null,"subject":"cherry-pick cannot merge binary files? (also strategy does not work?)","fromName":"Piotr Krukowiecki","fromEmail":"piotr.krukowiecki@gmail.com","sentAt":"2011-08-11T12:58:34Z","receivedAt":"2011-08-11T12:58:34Z","isPatch":false,"sender":{"key":"piotr.krukowiecki@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3259959?v=4"},"body":"Hi,\n\nIt seems cherry-pick can't merge binary files. I suppose this can be\nconsidered a bug or a feature. But I expected I could use \"theirs\"\nmerge strategy to overcome (auto-resolve) this - but it seems it's\neither not working, or I'm doing something wrong. Any hints?\n\n\n[t]$ git init\nInitialized empty Git repository in /tmp/t/.git/\n[t (master)]$ echo a > a.txt && gzip a.txt && git add a.txt.gz && git\ncommit -m base\n[master (root-commit) 64587708] base\n 1 files changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 a.txt.gz\n[t (master)]$ mv a.txt.gz a.txt && gzip a.txt && git add a.txt.gz &&\ngit commit -m 1\n[master 7b73fea9] 1\n 1 files changed, 0 insertions(+), 0 deletions(-)\n[t (master)]$ git checkout -b two HEAD^\nSwitched to a new branch 'two'\n[t (two)]$ mv a.txt.gz a.txt && echo b > a.txt && gzip a.txt && git\nadd a.txt.gz && git commit -m 2\n[two 57723852] 2\n 1 files changed, 0 insertions(+), 0 deletions(-)\n[t (two)]$ git cherry-pick master\nwarning: Cannot merge binary files: a.txt.gz (HEAD vs. 7b73fea9... 1)\n\nerror: could not apply 7b73fea9... 1\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n[t (two|CHERRY-PICKING)]$ git reset\n[t (two)]$ git cherry-pick --strategy=recursive --strategy-option=theirs master\nwarning: Cannot merge binary files: a.txt.gz (HEAD vs. 7b73fea9... 1)\n\nerror: could not apply 7b73fea9... 1\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n\n\nThanks,\n\n-- \nPiotr Krukowiecki\n"}]}