Comment 25 for bug 2071734

Revision history for this message
sean mooney (sean-k-mooney) wrote : Re: Regression VMDK/qcow arbitrary file access

actully applying patchs with "git am -3 < patch_file" works cleanly.

i have preperared the branch specific version in any case and will start uploading them now

i belive -3 is needed because the parent commit sha is changing between branch and git needs the extra context of the 3 way merge to resolve the applcaition.