Re: [Condor-devel] how to merge manual

[Erik Erlandson <eje@xxxxxxxxxx>]

> The case I am thinking of is a src + doc change to V7_6-branch.  Is 
> there a way to merge that into V7_7_0-doc branch without also merging 
> the src change?


If we (hypothetically) adopted this kind of scheme, it would probably
work smoothest if updates to doc were done as separate commits.  (So, a
ticket would have a commit for src update and a separate commit for doc
updates)

I don't think that prevents src updates from tagging along if actual
merges are used, but it would at least allow the option for doc updates
to be cherry-picked without grabbing unwanted src updates.

For the record, I think Tim has a point regarding a policy of freezing
doc along with code for any given release.  If that implies Karen acts
as doc wrangler for release branches and is part of release workflow,
that makes sense from a "1st class citizen" POV.