https://bz.apache.org/bugzilla/show_bug.cgi?id=67442
Jakub <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEEDINFO |NEW --- Comment #4 from Jakub <[email protected]> --- Apologies, I thought that Ant patch is the preferred way (as per https://poi.apache.org/devel/guidelines.html). I can try the git but it will take me some time to set things up and get used to it... What is the conflict? Note that in the patch package I've included the Ant generated patch (patch_orig.txt) as well as a cleaned version of it (patch_cleaned.txt) which has only relevant changes (mostly svn ignore differences). There is also 67442_TortoiseSVN.patch for reference. If you processing the patch automatically maybe just renaming the patch_cleaned.txt to patch.txt will do the job? -- You are receiving this mail because: You are the assignee for the bug. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
