opencog-dev team mailing list archive

["Linas Vepstas" <linasvepstas@xxxxxxxxx>]

2008/10/27 Cassio Pennachin <cassio@xxxxxxxxxxxxx>:
> Once staging is deemed stable enough, Gama will merge it into main.

As Joel points out, the problem here seems to be that the staging
branch, and the main branch has diverged. That is, some of the
code that he needs is in staging, and some is in main -- and he's
stuck, because there is no one branch that has everything that he
needs.

Presumably the problem arose because no one is  rebasing
staging on the current main branch.

Thus, one of the policies should probably be "rebase staging on
main every day", or at least weekly.  Would that work?

--linas