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, ro...@racket-lang.org wrote:
> =====[ 2 Commits ]======================================================
>
> a470b44 Robby Findler <ro...@racket-lang.org> 2010-05-08 16:18
> :
> | Merge branch 'master' of git:plt
> :
> : *** Trivial merge (omitting list) ***
On May 10, j...@racket-lang.org wrote:
>
> =====[ 2 Commits ]======================================================
>
> 10377c3 Jay McCarthy <j...@racket-lang.org> 2010-05-10 11:41
> :
> | Merge branch 'master' of git.racket-lang.org:plt
> :
> : *** Trivial merge (omitting list) ***
On May 10, c...@racket-lang.org wrote:
>
> =====[ 2 Commits ]======================================================
>
> 9383546 Carl Eastlund <c...@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!
_________________________________________________
For list-related administrative tasks:
http://list.cs.brown.edu/mailman/listinfo/plt-dev
