On 2013-10-07, at 1:27 PM, David E. Wheeler <firstname.lastname@example.org> wrote: > On Oct 6, 2013, at 2:12 PM, Phillip Smith <email@example.com> wrote:
>> I've got a bit of time now, and I'm willing to take a run at releases 2.0.2 if no one else is going to jump on it.
>> David: when are you around/available should I hit a bump?
> I'm on IRC regular work hours.
I've got a version of bricoleurs/bricolage master branch with the most recent pull requested merged (and re-tested). I've updated Bric::Changes (just with a few lines for the most recent bug fixes), and I've incremented inst/versions.txt from 2.1.0 to 2.2.0 … though, looking through Bric::Changes and so on, I can't make out if this should be 2.2.0 or 2.0.2.
Reading the last comment here: https://github.com/bricoleurs/bricolage/pull/49#issuecomment-36291906
It leads me to believe that I should:
a) Push these local changes to bricolage/tree/master
b) Merge these changes into bricolage/tree/rev-2.0
However, rev-2.0 says "This branch is 118 commits ahead and 149 commits behind master" -- which is quite confusing to say the least. If I try a basic --no-ff merge, I see a lot of merge conflicts (that I'd rather not have to work through by hand if possible).
Any pointers appreciated.
Phillip Smith http://phillipadsmith.com