Re: [sage-devel] 'git trac' instructions for rebasing/merging

2015-03-13 Thread Volker Braun
On Friday, March 13, 2015 at 6:10:09 PM UTC+1, Jonas Jermann wrote: > > At the moment the git history of sage looks quite messy > and I assume it will get worse, not better. It doesn't get messier over time, its more of a steady state. You either make the history more difficult to understand,

Re: [sage-devel] 'git trac' instructions for rebasing/merging

2015-03-13 Thread Jonas Jermann
Hi On 12.03.2015 08:28, Nathann Cohen wrote: Hello everybody, I just noticed that we do not seem to have in our developer's manual instructions about how to rebase/merge a branch when it becomes incompatible with the latest beta. I do not use 'git trac' myself, but it would be cool if anybody

[sage-devel] 'git trac' instructions for rebasing/merging

2015-03-12 Thread Nathann Cohen
Hello everybody, I just noticed that we do not seem to have in our developer's manual instructions about how to rebase/merge a branch when it becomes incompatible with the latest beta. I do not use 'git trac' myself, but it would be cool if anybody who does could add such an entry in the develope