Message-ID: <56C66529.1070005@anastigmatix.net>
Date: Thu, 18 Feb 2016 19:43:21 -0500
From: Chapman Flack <chap@anastigmatix.net>
MIME-Version: 1.0
References: <56C41C5B.9000809@lucee.org> <56C4D516.9010403@hogranch.com>
 <56C4D8C4.4010809@anastigmatix.net> <56C50E87.4070008@lucee.org>
 <56C51150.1070708@anastigmatix.net> <56C54EE0.2080905@lucee.org>
 <56C553C3.40408@lucee.org> <56C556BD.1010907@anastigmatix.net>
 <56C55824.1060502@lucee.org> <56C564F4.1050909@anastigmatix.net>
 <56C5E1B3.8090204@lucee.org> <56C5E795.4080405@anastigmatix.net>
In-Reply-To: <56C5E795.4080405@anastigmatix.net>
Subject: Re: [Pljava-dev] Build Fails on Windows 7
Content-Type: text/plain; charset="us-ascii"

On 02/18/16 10:47, Chapman Flack wrote:

> #1  I was up too late last night, and I forgot to rebase the
>     branch I created onto the right place, and now I'll have to
>     do the thing no respectable git hacker ever does, and rebase
>     it after publication. Phooey.
> 
>     Hey you guys on pljava-dev, nobody base stuff off this
>     branch, ok?

I have rebased that branch where it belonged. Sorry about any
disruption. If you have pulled from it before, you may find
it easiest to just

git checkout master   # go back to master branch
git branch -d port/REL1_5_STABLE-BASE/mingw64 # delete branch
git remote update
git checkout port/REL1_5_STABLE-BASE/mingw64

-Chap
_______________________________________________
Pljava-dev mailing list
Pljava-dev@lists.pgfoundry.org
http://lists.pgfoundry.org/mailman/listinfo/pljava-dev