commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Evan Ward <evan.w...@nrl.navy.mil>
Subject Re: [Math] RNG refactoring
Date Fri, 25 Mar 2016 15:56:26 GMT
I'm not sure if this is the problem, but a good rule of thumb is that if
you have pushed a commit you should merge it instead of rebasing it. It
looks to me like 6ddf476 and ce8c82f are the same, so I think when you
ran rebase it put it on top of the bug fix I pushed up recently,
duplicating the commit.

Best Regards,
Evan

On 03/25/2016 11:34 AM, Gilles wrote:
> Hi.
>
> Last week, and just now, I've pushed local branches that handle
> the following issues (and others, either related, or set to
> "Won't fix [in current code]" in JIRA[1]):
>
>  https://issues.apache.org/jira/browse/MATH-1335
>  https://issues.apache.org/jira/browse/MATH-1336
>  https://issues.apache.org/jira/browse/MATH-1337
>  https://issues.apache.org/jira/browse/MATH-1339
>  https://issues.apache.org/jira/browse/MATH-1158
>  https://issues.apache.org/jira/browse/MATH-1338
>
> [I've just seen that for branch "feature-MATH-1158" which is
> "git rebase"d on "feature-MATH-1335", the push is recreating
> all the MATH-1335 commits (as guessed from the flood of emails).
> Something I was not expecting: sorry I misunderstood how this
> is supposed to work...]
>
>
> Regards,
> Gilles
>
> [1] See the "links" in the relevant JIRA reports.
>
>
> ---------------------------------------------------------------------
> 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