commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Christopher <ctubb...@apache.org>
Subject Re: [math][git] newbie question: best way to backport?
Date Wed, 11 Mar 2015 21:20:53 GMT
You should still be able to cherry-pick. You'll just have some work to
do to resolve the conflicts. You may be able to increase the rename
detection with:

git config merge.renameLimit 99999999

You may also be able to create a patch using "git format-patch" and
apply it using "git am -3".

--
Christopher L Tubbs II
http://gravatar.com/ctubbsii


On Sun, Mar 8, 2015 at 6:09 PM, Phil Steitz <phil.steitz@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-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message