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.
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.