On Mon, Mar 22, 2010 at 23:18, Josh Berkus <josh@agliodbs.com> wrote:
>
>> Uh why? Open the file with a text editor, cut and paste the lines
>> elsewhere.
>
> ... because even one edit by anyone else is a merge conflict. And CVS
> isn't too good with merge conflicts. Also few of the people whom I'd
> want to ask for help are committers -- the release notes are as much
> about advocacy as they are about code.
>
> If I can use git, it's quite a bit better. Thing is, if I start a git
> branch for this, are we going to be able to merge it back to the main repo?
Pretty easily. The obvious way is that you merge *your* branch with
the main repo as often as possible. Git does a pretty good job of
helping you there - a lot better than cvs - but there may still be
some conflicts of course. But there will always be conflicts if two
people edit the same thing, regardless of tools.
Once that is done, the only "chokepoint" for conflicts is between you
generating a diff from that branch and said diff being applied, which
would be a very short time.
-- Magnus HaganderMe: http://www.hagander.net/Work: http://www.redpill-linpro.com/
