[plt-dev] Re: [plt] Push #20178: master branch updated

I've tried to read your file, but it got pretty complicated and full
of what seemed to be not so useful details, so I gave up (twice now).
I do plan to read the whole thing, but can you perhaps provide some
more of a hint that's tailored to this situation?

Thanks,
Robby

On Mon, May 10, 2010 at 6:41 PM, Eli Barzilay <eli at barzilay.org> wrote:
> Please take the time to read the git text that I wrote (specifically,
> the "dealing with conflicts" section).  Doing a merge commit for a
> single commit, as done in the following three cases, is something that
> has no use.
>
>
> On May  8, robby at racket-lang.org wrote:
>> =====[ 2 Commits ]======================================================
>>
>> a470b44 Robby Findler <robby at racket-lang.org> 2010-05-08 16:18
>> :
>> | Merge branch 'master' of git:plt
>> :
>> : *** Trivial merge (omitting list) ***
>
> On May 10, jay at racket-lang.org wrote:
>>
>> =====[ 2 Commits ]======================================================
>>
>> 10377c3 Jay McCarthy <jay at racket-lang.org> 2010-05-10 11:41
>> :
>> | Merge branch 'master' of git.racket-lang.org:plt
>> :
>> : *** Trivial merge (omitting list) ***
>
> On May 10, cce at racket-lang.org wrote:
>>
>> =====[ 2 Commits ]======================================================
>>
>> 9383546 Carl Eastlund <cce at racket-lang.org> 2010-05-10 16:39
>> :
>> | Merge branch 'master' of git:plt
>> :
>> : *** Trivial merge (omitting list) ***
>
> --
>          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
>                    http://barzilay.org/                   Maze is Life!
>