On Thu, May 22, 2008 at 04:11:20PM +0200, Matej Vela wrote: > I've been mulling this over, and I think the answer is to treat the > Debian branch as definitive, i.e. merge with strategy "ours". After > all, any conflicts must have been resolved by the packager, and the > Debian patch is a result of that. I'll have to try this a bit but it makes sense. If it works out we can do this by default and disable it via --no-merge. Thanks, -- Guido
-- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
