X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
X-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=googlemail.com; s=20120113;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        bh=kbar/VsuL7emfaSqkEFiATM/0V+hGs7rg4yfGdi/MgI=;
        b=ocYr21DrWpGqVhbwWR6a/JRiiYs7uMc0sQyVATpRcvSjlnV/FCl6XFeDbMo9KPzpIm
         2CfQBGHY38BSlmSqs/y2edlYmGNEWD7zZAnYSChqyGdyG/+tf4jdgG+yfmx1YNTGtrAp
         r/xeISn/gqwsAPVLA0IMJwa8tALSKckWc8PKlfTOKFT6VhjjJMyswY6ckpnb+OHsqnZi
         wVGAtbC9OnQFcHg7IHkxbwxWRU/ErYg78+r84RI61tdeyRGBO56yDhGFeCN8jlLqM92t
         35vxB1vqnjdSBtaw04mzxicBPKaYJwzNw/utBpd6gnhLF2mk0kQF+N+zJPhJEH+gASrS
         7Pxw==
MIME-Version: 1.0
X-Received: by 10.60.97.2 with SMTP id dw2mr54194077oeb.40.1451771628052; Sat,
 02 Jan 2016 13:53:48 -0800 (PST)
In-Reply-To: <CAC4O8c-nPx1isS2DA4=X1vQFVY51vQ6pAY6sSfHBMog_m0_2dg@mail.gmail.com>
References: <CAC4O8c_p5bMB1cKzDEsQFSnbZvY3TgnczH94pO_qCoJmiv2iWQ AT mail DOT gmail DOT com>
	<CAJXU7q9rMcQpLU5020RoZTqskT4moOS6f3Ugw+g3_mhO565MLg AT mail DOT gmail DOT com>
	<CAC4O8c-nPx1isS2DA4=X1vQFVY51vQ6pAY6sSfHBMog_m0_2dg AT mail DOT gmail DOT com>
Date: Sat, 2 Jan 2016 21:53:47 +0000
Message-ID: <CAJXU7q8jLiY2oAGmkgfXfzdNoAg2xVRx8bxgAXyF_qqYs=9Dgw@mail.gmail.com>
Subject: Re: [geda-user] Merging stuff. How to make it happen
From: "Peter Clifton (petercjclifton AT googlemail DOT com) [via geda-user AT delorie DOT com]" <geda-user AT delorie DOT com>
To: gEDA User Mailing List <geda-user AT delorie DOT com>
Content-Type: multipart/alternative; boundary=089e01176aab2f678a052860ecd2
Reply-To: geda-user AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: geda-user AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

--089e01176aab2f678a052860ecd2
Content-Type: text/plain; charset=UTF-8

Excellent,

I think doing some interactive review / chattting on IRC will probably be a
fun way to look at this. I might ask you to take a look at some of mine
too. (If we catch Bert or DJ too by any chance, that would also be cool).

What timezone are you in? I'm GMT, but might not be up super early tomorrow
after two busy days I've spent in London.

We can chat about merging vs. rebase on IRC, but since your already in a
branch in the main repo, a merge seems the most likely way to proceed.

Best wishes,

Peter
On 2 Jan 2016 19:04, "Britton Kerin (britton DOT kerin AT gmail DOT com) [via
geda-user AT delorie DOT com]" <geda-user AT delorie DOT com> wrote:

>
>
> On Fri, Jan 1, 2016 at 10:52 PM, Peter Clifton (
> petercjclifton AT googlemail DOT com) [via geda-user AT delorie DOT com] <
> geda-user AT delorie DOT com> wrote:
>
>> Hi Britton,
>>
>> I've been looking at some of your branches, (a quick look at least), and
>> would like to do a more in depth review.
>>
> Any objections to that before merging? I can try to find some time
>> tomorrow if your about.
>>
> No.  I'll be in and out most of today.  I want to change some thing on the
>  big fix_drc_violation_locations branch, but all the small branches are
> done I think.
>
>> Would appreciate a second pair of eyes on some of my stuff too, in the
>> not yo distant future.
>>
> Sure.
>
> Britton
>

--089e01176aab2f678a052860ecd2
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<p dir=3D"ltr">Excellent,</p>
<p dir=3D"ltr">I think doing some interactive review / chattting on IRC wil=
l probably be a fun way to look at this. I might ask you to take a look at =
some of mine too. (If we catch Bert or DJ too by any chance, that would als=
o be cool).</p>
<p dir=3D"ltr">What timezone are you in? I&#39;m GMT, but might not be up s=
uper early tomorrow after two busy days I&#39;ve spent in London.</p>
<p dir=3D"ltr">We can chat about merging vs. rebase on IRC, but since your =
already in a branch in the main repo, a merge seems the most likely way to =
proceed.<br></p>
<p dir=3D"ltr">Best wishes,</p>
<p dir=3D"ltr">Peter</p>
<div class=3D"gmail_quote">On 2 Jan 2016 19:04, &quot;Britton Kerin (<a hre=
f=3D"mailto:britton DOT kerin AT gmail DOT com">britton DOT kerin AT gmail DOT com</a>) [via <a h=
ref=3D"mailto:geda-user AT delorie DOT com">geda-user AT delorie DOT com</a>]&quot; &lt;<=
a href=3D"mailto:geda-user AT delorie DOT com">geda-user AT delorie DOT com</a>&gt; wrote=
:<br type=3D"attribution"><blockquote class=3D"gmail_quote" style=3D"margin=
:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir=3D"ltr"><=
br><div class=3D"gmail_extra"><br><div class=3D"gmail_quote">On Fri, Jan 1,=
 2016 at 10:52 PM, Peter Clifton (<a href=3D"mailto:petercjclifton AT googlema=
il.com" target=3D"_blank">petercjclifton AT googlemail DOT com</a>) [via <a href=
=3D"mailto:geda-user AT delorie DOT com" target=3D"_blank">geda-user AT delorie DOT com</=
a>] <span dir=3D"ltr">&lt;<a href=3D"mailto:geda-user AT delorie DOT com" target=
=3D"_blank">geda-user AT delorie DOT com</a>&gt;</span> wrote:<br><blockquote clas=
s=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;pad=
ding-left:1ex"><p dir=3D"ltr">Hi Britton, </p>
<p dir=3D"ltr">I&#39;ve been looking at some of your branches, (a quick loo=
k at least), and would like to do a more in depth review.=C2=A0</p></blockq=
uote><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-le=
ft:1px #ccc solid;padding-left:1ex">
<p dir=3D"ltr">Any objections to that before merging? I can try to find som=
e time tomorrow if your about.</p></blockquote><div>No.=C2=A0 I&#39;ll be i=
n and out most of today.=C2=A0 I want to change some thing on the =C2=A0big=
 fix_drc_violation_locations branch, but all the small branches are done I =
think.</div><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;bo=
rder-left:1px #ccc solid;padding-left:1ex">
<p dir=3D"ltr">Would appreciate a second pair of eyes on some of my stuff t=
oo, in the not yo distant future.</p></blockquote><div>Sure.</div><div>=C2=
=A0</div><div>Britton</div></div></div></div>
</blockquote></div>

--089e01176aab2f678a052860ecd2--