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 who
does could add such an entry in the developer's manual: this is
something that we are bound to explain individually many many times
otherwise.
In the meantime I will try to make the 'git the hard way' version of
it a bit easier to follow.
Just an idea:
What about suggesting to use git rebase instead of git merge
(at least at the end)?
At the moment the git history of sage looks quite messy
and I assume it will get worse, not better.
Having a "git rebase before inclusion" policy (or at least a suggestion)
would help.
Best
Jonas
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.
