Hi Phil, In the past I have used something like "git checkout -b temp-backport && git rebase -i" to squash multiple backportable commits into a single commit, and then it sometimes applies better (less conflicts in some cases) than using cherry-pick on all of the individual commits.
However, that was not in cases like this where the package names are changed at major releases. I am not sure if you can manually edit the squashed diff to fix the package names and still have it apply. Cheers, Peter On 9 March 2015 at 09:09, Phil Steitz <phil.ste...@gmail.com> wrote: > cherry-pick barfs because paths have changed due to package rename. > What is the best way to backport fixes to 3_X or the other way? > > Phil > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > For additional commands, e-mail: dev-h...@commons.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
