But all of the technical details about merging and rebasing aside, I
completely agree that huge branches should be avoided whenever
possible.
Cheers,
Brian
2011/7/26 Ondřej Čertík :
> On Tue, Jul 26, 2011 at 1:48 PM, Aaron Meurer wrote:
>> Basically, it was like this:
>>
>> Mateusz had his poly
2011/7/26 Ondřej Čertík :
> On Tue, Jul 26, 2011 at 1:48 PM, Aaron Meurer wrote:
>> Basically, it was like this:
>>
>> Mateusz had his polys branch, which had all his polys fixes. Every
>> time Mateusz wanted to be up to date with master, he rebased, and
>> created a new branch, polys2, polys3, e
On Tue, Jul 26, 2011 at 1:48 PM, Aaron Meurer wrote:
> Basically, it was like this:
>
> Mateusz had his polys branch, which had all his polys fixes. Every
> time Mateusz wanted to be up to date with master, he rebased, and
> created a new branch, polys2, polys3, etc.
>
> My branch from the start,
On Tue, Jul 26, 2011 at 2:48 PM, Aaron Meurer wrote:
> Basically, it was like this:
>
> Mateusz had his polys branch, which had all his polys fixes. Every
> time Mateusz wanted to be up to date with master, he rebased, and
> created a new branch, polys2, polys3, etc.
>
> My branch from the start,
Basically, it was like this:
Mateusz had his polys branch, which had all his polys fixes. Every
time Mateusz wanted to be up to date with master, he rebased, and
created a new branch, polys2, polys3, etc.
My branch from the start, integration, was based on one of these polys
branches. Then, whe
On Mon, Jul 25, 2011 at 3:24 PM, Aaron Meurer wrote:
> Hi everyone.
Can you describe what exactly you did with your branch? I.e.:
1) forked sympy in summer 2010, kept adding patches
2) merged with polys1 branch
3) polys12 (incompatible with polys1) merged to master
4) merged with master (thus *c
Hi everyone.
I wrote a blog post about this
(http://asmeurersympy.wordpress.com/2011/07/25/merging-integration3-with-sympy-0-7-0-nightmare/),
but I think it's important enough that it should be discussed here.
You can read my blog post for the details, but basically I spent the
past three weeks o
