On 3/8/15 3:34 PM, Peter Ansell wrote:
> 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-pic
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
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-mai
Hi Arthur,
many thanks for this detailed analysis! Your conclusion is to the point:
your proposal is certainly valuable, but it is hard to explain it to
users and give them sound recommendations. So I am on the fence. If we
add this class, the pros and cons you listed should in any case become
par
