Are trivals in g2 merged into HEAD immediately?

[David Hampton]

On Wed, 2004-12-22 at 16:26 -0500, Chris Shoemaker wrote:

> Actually, I'm more curious about the branch relations.

I've been doing periodic syncs from HEAD->g2 for the last year or so.
At some point the group will decide that what's in the g2 branch should
become the main code base that everyone uses, and there will be a single
massive collapse (merge) of the g2 branch back into HEAD.

> Would this be
> committed only to g2 branch for some later massive merge of g2 into
> HEAD, or is trivial stuff committed to g2 and then merged to HEAD
> immediately?

This could either be committed to HEAD and get swept up in the next sync
of the g2 branch, or since its trivial and shouldn't cause a sync
conflict, it could be double committed.

David

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.gnucash.org/pipermail/gnucash-devel/attachments/20041223/6f816fc8/attachment.bin