[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Pika-dev] Re: small doc fixes
From: |
Tom Lord |
Subject: |
Re: [Pika-dev] Re: small doc fixes |
Date: |
Sun, 14 Dec 2003 13:46:10 -0800 (PST) |
> From: Matthew Dempsky <address@hidden>
> Ben,
> This patch conflicts with Tom's latest (he found a few of the typos
> you did before hand), so you might want to update for that.
No need. It actually doesn't conflict with `star-merge --three-way'
(and wouldn't by passing --forward to star-merge or any other merge
operator).
> Now that you have multiple sources of incoming patches (me, Ben,
> and soon jao), how would you like to handle this? I'd be more
> than happy to serve the role of "patch wrangler" (sorta like
> Robert is doing for arch) and integrate their patches and keep
> them up to date with your tree so it will be easy for you to
> focus on advancing the tree rather than fixing conflicts. (If
> so I'll probably setup an integration branch like Robert too.)
No need just yet, I think. Perhaps soon, though. Thanks.
-t