opencog-dev team mailing list archive

["Joel Pitt" <joel.pitt@xxxxxxxxx>]

On Tue, Oct 28, 2008 at 12:02 PM, David Hart <hart@xxxxxxxxxxxx> wrote:
> Any other suggestions on a better/clearer name for the branch now named
> 'staging'?

We've started using staging so I think we can keep using it. Changing
to something else will just confuse things (even more!).

> I suspect however that it's impossible to please everyone with any single
> workflow or branch naming scheme.

I suspect the same, which is why I think we should all just accept the
decided work flow and get on with it. It's as simple as:

"Use staging for development."

If someone has a special case/need for an unchanging branch, they can
branch from main and then continue commits to a personal branch for
that work (later rebasing on staging and pushing to staging if they
want or need to share their work).

Linas, you made a comment about the --overwrite... it's unfortunately
a result of the rebasing process. Once you rebase on another branch
and you want to push back to original... the version history is no
longer the same.

J