From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from qmta13.westchester.pa.mail.comcast.net (qmta13.westchester.pa.mail.comcast.net [IPv6:2001:558:fe14:44:76:96:59:243]) by hurricane.the-brannons.com (Postfix) with ESMTP id 8F01C77AAF for ; Tue, 24 Dec 2013 08:13:09 -0800 (PST) Received: from omta01.westchester.pa.mail.comcast.net ([76.96.62.11]) by qmta13.westchester.pa.mail.comcast.net with comcast id 5RC21n0020EZKEL5DUD4T5; Tue, 24 Dec 2013 16:13:04 +0000 Received: from eklhad ([107.5.36.150]) by omta01.westchester.pa.mail.comcast.net with comcast id 5UD41n00E3EMmQj3MUD48K; Tue, 24 Dec 2013 16:13:04 +0000 To: Edbrowse-dev@lists.the-brannons.com From: Karl Dahlke User-Agent: edbrowse/3.4.10 Date: Tue, 24 Dec 2013 11:13:03 -0500 Message-ID: <20131124111303.eklhad@comcast.net> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387901584; bh=k72RmpVpyZUVEzRB6lwT1puba53jphCBDDvOseFdij4=; h=Received:Received:To:From:Reply-to:Subject:Date:Message-ID: Mime-Version:Content-Type; b=rqGfvOG01LaA7Bpu8Kee+Uj+muGHOZUUMDRK7GbEK4doIjF5L09eGsrOIvEZmwg05 Qwpzq4YHnj9a7GpY0rDfzgX63ss1bEykPaLAa/+A/m2xOCJZWS7T5MhLZoqfx49kpg n+duBqnqchCgUaAcGL7pfKNk33pXCdkfrTDS3NCsgE55GuyUKBKcG0+bE3ccDYYCv7 Jvx5rp2Yz9Ur/BU66lIDLiiLItjn02GnSNK55MdFq0NKdbSgcfaXNXoVrgj5JtY5jy xe9Fr3FRwSRqM4yG1tk8FJ8ruQid/wk2x028WcL1cUUCG6m3oAEj1dQZHGgVHaPsmu Lt3oPe5HZC5nA== Subject: [Edbrowse-dev] even more confused X-BeenThere: edbrowse-dev@lists.the-brannons.com X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Karl Dahlke List-Id: Edbrowse Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2013 16:13:09 -0000 Ok, 2 of the 4 patches Adam sent I didn't need, cause I did the same thing, and Chris did the same thingtoo, in another branch. Jesus! But the other two patches I need. I tried to put in the one, to extern C the header file, and I thought the command was git am mail_file but I got this response, and eb.h did not change at all. previous rebase directory /home/eklhad/progs/edbrowse/.git/rebase-apply still exists but mbox given. What????????????? Never saw that message before! And it's clear as mud, like most of git. I could cut&paste Adam's patch out mannually and apply it, that's not hard, but I just don't understand what is going on. I'm glad people like git, but I think it can really confuse things, at least it has confused me. On a related note, even though I don't know much about git, I do know about source control in general, and in general, when you merge two branches together, as Chris is suggesting, if both those branches have zillions of changes to essentially the same lines of code, which is already the case for us, the merge is probably going to be impossible. In other words, we have already set these branches up to collide in a bad way. So what do we do now? Well I will hold these two patches in my hand, and not do anything with them, until Chriss tells me what to do, unless of course my git am command actually did something with that first patch, but if it did I don't see it. IDK Karl Dahlke