???
This is an old commit of mine, which has a bug in it (missing $), that I
fixed in a subsequent commit...
EdB
On Wednesday, July 17, 2013, wrote:
> Updated Branches:
> refs/heads/release4.10.0 5ddc3f78c -> 11d252a1b
>
>
> Fixed boolean conditional (hopefully, most of my shell scripting i
Ah, you're merging into the release branch? Don't forget to include the
actual fix ;-)
EdB
On Wednesday, July 17, 2013, Erik de Bruin wrote:
> ???
>
> This is an old commit of mine, which has a bug in it (missing $), that I
> fixed in a subsequent commit...
>
> EdB
>
>
>
> On Wednesday, July 1
Hmm. Maybe something went wrong. I checkout the release branch, made
some changes, then did git pull --rebase on the release branch to sync up.
It picked up this one change, but not the other?
Strange stuff...
-Alex
On 7/17/13 12:31 PM, "Erik de Bruin" wrote:
>Ah, you're merging into the re
Not sure what I did wrong. Anyway, I merged your "actual fix" into the
release branch. I hope I did that right.
-Alex
On 7/17/13 1:06 PM, "Alex Harui" wrote:
>Hmm. Maybe something went wrong. I checkout the release branch, made
>some changes, then did git pull --rebase on the release branch
Hi,
> Not sure what I did wrong. Anyway, I merged your "actual fix" into the
> release branch. I hope I did that right.
Looks even more complex now - take a look at the tree.
Justin
Yuk. Any idea what I did wrong? I pulled that commit and dropped it on
the head. Is there a way to inject it into the middle?
And I have no idea how I got into this trouble in the first place.
-Alex
On 7/17/13 4:39 PM, "Justin Mclean" wrote:
>Hi,
>
>> Not sure what I did wrong. Anyway, I m
