rebasing
as a tool to keep in mind, even if you don't employ it in this use case.
http://ProGit.org/book is a great, easy to read resource.
Al
From:"Luc Maisonobe"
Date:Sun, Sep 13, 2015 at 4:26
Subject:Re: [Math] Compile only top-level package and below
Hi Al,
Le 13/09/2015
Le 13/09/2015 01:22, Gilles a écrit :
> Hi.
>
> On Sat, 05 Sep 2015 19:28:33 +0200, Luc Maisonobe wrote:
>> Le 05/09/2015 01:47, Gilles a écrit :
>>> On Fri, 04 Sep 2015 19:50:05 +0200, Thomas Neidhart wrote:
On 09/04/2015 03:08 PM, Gilles wrote:
> Hello.
>
> There are two branche
Hi Al,
Le 13/09/2015 03:17, Al Chou a écrit :
> You could use `git cherry-pick` to bring one or more commits from one branch
> into another.
Unfortunately, this does not work here, due to package renaming.
Luc
>
> Al
>
-
To
> On Sep 4, 2015, at 18:55, Gilles wrote:
>
>> On Fri, 4 Sep 2015 20:38:36 -0500, Ole Ersoy wrote:
>>> On 09/04/2015 08:14 PM, sebb wrote:
On 5 September 2015 at 01:13, Gilles wrote:
> On Sat, 5 Sep 2015 00:56:54 +0100, sebb wrote:
>> On 5 September 2015 at 00:55, Ole Ersoy wrote:
You could use `git cherry-pick` to bring one or more commits from one branch
into another.
Al
There are several ways one could address this situation; I think I would simply
create a new branch in Git and commit those new files only on that branch.
Al
Hi.
On Sat, 05 Sep 2015 19:28:33 +0200, Luc Maisonobe wrote:
Le 05/09/2015 01:47, Gilles a écrit :
On Fri, 04 Sep 2015 19:50:05 +0200, Thomas Neidhart wrote:
On 09/04/2015 03:08 PM, Gilles wrote:
Hello.
There are two branches for Commons Math.
For one, the top-level Java package is
org.ap
On 9/5/15 10:28 AM, Luc Maisonobe wrote:
> Le 05/09/2015 01:47, Gilles a écrit :
>> On Fri, 04 Sep 2015 19:50:05 +0200, Thomas Neidhart wrote:
>>> On 09/04/2015 03:08 PM, Gilles wrote:
Hello.
There are two branches for Commons Math.
For one, the top-level Java package is
>>
Le 05/09/2015 01:47, Gilles a écrit :
> On Fri, 04 Sep 2015 19:50:05 +0200, Thomas Neidhart wrote:
>> On 09/04/2015 03:08 PM, Gilles wrote:
>>> Hello.
>>>
>>> There are two branches for Commons Math.
>>>
>>> For one, the top-level Java package is
>>> org.apache.commons.math4
>>> For the other, it
On Fri, 4 Sep 2015 20:38:36 -0500, Ole Ersoy wrote:
On 09/04/2015 08:14 PM, sebb wrote:
On 5 September 2015 at 01:13, Gilles
wrote:
On Sat, 5 Sep 2015 00:56:54 +0100, sebb wrote:
On 5 September 2015 at 00:55, Ole Ersoy
wrote:
On 09/04/2015 06:06 PM, Gilles wrote:
On Fri, 4 Sep 2015 11:0
On Sat, 5 Sep 2015 02:14:03 +0100, sebb wrote:
On 5 September 2015 at 01:13, Gilles
wrote:
On Sat, 5 Sep 2015 00:56:54 +0100, sebb wrote:
On 5 September 2015 at 00:55, Ole Ersoy
wrote:
On 09/04/2015 06:06 PM, Gilles wrote:
On Fri, 4 Sep 2015 11:03:08 -0500, Ole Ersoy wrote:
On 09/
On 09/04/2015 08:14 PM, sebb wrote:
On 5 September 2015 at 01:13, Gilles wrote:
On Sat, 5 Sep 2015 00:56:54 +0100, sebb wrote:
On 5 September 2015 at 00:55, Ole Ersoy wrote:
On 09/04/2015 06:06 PM, Gilles wrote:
On Fri, 4 Sep 2015 11:03:08 -0500, Ole Ersoy wrote:
On 09/04/2015 10:26
On 5 September 2015 at 01:13, Gilles wrote:
> On Sat, 5 Sep 2015 00:56:54 +0100, sebb wrote:
>>
>> On 5 September 2015 at 00:55, Ole Ersoy wrote:
>>>
>>>
>>>
>>> On 09/04/2015 06:06 PM, Gilles wrote:
On Fri, 4 Sep 2015 11:03:08 -0500, Ole Ersoy wrote:
>
>
> On 09/04/201
On Sat, 5 Sep 2015 00:56:54 +0100, sebb wrote:
On 5 September 2015 at 00:55, Ole Ersoy wrote:
On 09/04/2015 06:06 PM, Gilles wrote:
On Fri, 4 Sep 2015 11:03:08 -0500, Ole Ersoy wrote:
On 09/04/2015 10:26 AM, Gilles wrote:
On Fri, 4 Sep 2015 10:11:04 -0500, Ole Ersoy wrote:
You have le
On 5 September 2015 at 00:55, Ole Ersoy wrote:
>
>
> On 09/04/2015 06:06 PM, Gilles wrote:
>>
>> On Fri, 4 Sep 2015 11:03:08 -0500, Ole Ersoy wrote:
>>>
>>> On 09/04/2015 10:26 AM, Gilles wrote:
On Fri, 4 Sep 2015 10:11:04 -0500, Ole Ersoy wrote:
>
> You have left over files in `
On 09/04/2015 06:06 PM, Gilles wrote:
On Fri, 4 Sep 2015 11:03:08 -0500, Ole Ersoy wrote:
On 09/04/2015 10:26 AM, Gilles wrote:
On Fri, 4 Sep 2015 10:11:04 -0500, Ole Ersoy wrote:
You have left over files in `target` after switching between the
branches. For example check out `math4`. Buil
On Fri, 04 Sep 2015 19:50:05 +0200, Thomas Neidhart wrote:
On 09/04/2015 03:08 PM, Gilles wrote:
Hello.
There are two branches for Commons Math.
For one, the top-level Java package is
org.apache.commons.math4
For the other, it is
org.apache.commons.math3
Unless I'm mistaken, this should i
On Fri, 4 Sep 2015 18:30:45 +0100, sebb wrote:
On 4 September 2015 at 16:30, Gilles
wrote:
On Fri, 4 Sep 2015 16:26:16 +0100, sebb wrote:
On 4 September 2015 at 15:42, Gilles
wrote:
Hi.
On Fri, 4 Sep 2015 15:30:57 +0100, sebb wrote:
On 4 September 2015 at 14:08, Gilles
wrote:
H
On Fri, 04 Sep 2015 18:19:42 +0200, Luc Maisonobe wrote:
Hi Gilles,
Le 04/09/2015 17:30, Gilles a écrit :
On Fri, 4 Sep 2015 16:26:16 +0100, sebb wrote:
On 4 September 2015 at 15:42, Gilles
wrote:
Hi.
On Fri, 4 Sep 2015 15:30:57 +0100, sebb wrote:
On 4 September 2015 at 14:08, Gilles
On Fri, 4 Sep 2015 11:03:08 -0500, Ole Ersoy wrote:
On 09/04/2015 10:26 AM, Gilles wrote:
On Fri, 4 Sep 2015 10:11:04 -0500, Ole Ersoy wrote:
You have left over files in `target` after switching between the
branches. For example check out `math4`. Build it. Switch to the
`math3` branch. Bui
On 09/04/2015 03:08 PM, Gilles wrote:
> Hello.
>
> There are two branches for Commons Math.
>
> For one, the top-level Java package is
> org.apache.commons.math4
> For the other, it is
> org.apache.commons.math3
>
> Unless I'm mistaken, this should imply that maven tries to compile
> only fi
On 4 September 2015 at 16:30, Gilles wrote:
> On Fri, 4 Sep 2015 16:26:16 +0100, sebb wrote:
>>
>> On 4 September 2015 at 15:42, Gilles wrote:
>>>
>>> Hi.
>>>
>>>
>>> On Fri, 4 Sep 2015 15:30:57 +0100, sebb wrote:
On 4 September 2015 at 14:08, Gilles
wrote:
>
>
>
Hi Gilles,
Le 04/09/2015 17:30, Gilles a écrit :
> On Fri, 4 Sep 2015 16:26:16 +0100, sebb wrote:
>> On 4 September 2015 at 15:42, Gilles
>> wrote:
>>> Hi.
>>>
>>>
>>> On Fri, 4 Sep 2015 15:30:57 +0100, sebb wrote:
On 4 September 2015 at 14:08, Gilles
wrote:
>
> Hello.
>>>
On 09/04/2015 10:26 AM, Gilles wrote:
On Fri, 4 Sep 2015 10:11:04 -0500, Ole Ersoy wrote:
You have left over files in `target` after switching between the
branches. For example check out `math4`. Build it. Switch to the
`math3` branch. Build it. Now `target` will contain both classes
from
On Fri, 4 Sep 2015 16:26:16 +0100, sebb wrote:
On 4 September 2015 at 15:42, Gilles
wrote:
Hi.
On Fri, 4 Sep 2015 15:30:57 +0100, sebb wrote:
On 4 September 2015 at 14:08, Gilles
wrote:
Hello.
There are two branches for Commons Math.
For one, the top-level Java package is
org.apache
On Fri, 4 Sep 2015 10:11:04 -0500, Ole Ersoy wrote:
You have left over files in `target` after switching between the
branches. For example check out `math4`. Build it. Switch to the
`math3` branch. Build it. Now `target` will contain both classes
from the math3 branch and the math4 branch.
On 4 September 2015 at 15:42, Gilles wrote:
> Hi.
>
>
> On Fri, 4 Sep 2015 15:30:57 +0100, sebb wrote:
>>
>> On 4 September 2015 at 14:08, Gilles wrote:
>>>
>>> Hello.
>>>
>>> There are two branches for Commons Math.
>>>
>>> For one, the top-level Java package is
>>> org.apache.commons.math4
>>
You have left over files in `target` after switching between the branches. For
example check out `math4`. Build it. Switch to the `math3` branch. Build it.
Now `target` will contain both classes from the math3 branch and the math4
branch.
Run clean before switching between branches and yo
Hi.
On Fri, 4 Sep 2015 15:30:57 +0100, sebb wrote:
On 4 September 2015 at 14:08, Gilles
wrote:
Hello.
There are two branches for Commons Math.
For one, the top-level Java package is
org.apache.commons.math4
For the other, it is
org.apache.commons.math3
Unless I'm mistaken, this should i
On 4 September 2015 at 14:08, Gilles wrote:
> Hello.
>
> There are two branches for Commons Math.
>
> For one, the top-level Java package is
> org.apache.commons.math4
> For the other, it is
> org.apache.commons.math3
>
> Unless I'm mistaken, this should imply that maven tries to compile
> onl
Hello.
There are two branches for Commons Math.
For one, the top-level Java package is
org.apache.commons.math4
For the other, it is
org.apache.commons.math3
Unless I'm mistaken, this should imply that maven tries to compile
only files under either
src/main/java/org/apache/commons/math4
31 matches
Mail list logo