> > Does the construction of the testing branch allows git bisect?
>>
>> Yes.  It's constructed by dynamically rebasing the branches onto the
>> growing branch, so there are no merge commits or other artifacts that would
>> mess up bisects.
>>
>
> by the way,  there's a discussion of merge commits and bisect in the git
> user manual:
>
> http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#bisect-merges
>

That was actually part of the motivation for the present strategy;
specifically, the conclusion of that section of the manual:

Partly for this reason, many experienced git users, even when working on an
otherwise merge-heavy project, keep the history linear by rebasing against
the latest upstream version before publishing.

It seems at least we'll be in good company, if "many experienced git users"
choose the same solution.

-- Markus

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to