mazubieta/collaborative-text-editor — comment on commit 01df4f386d304eab2770988820959f3068ae2d92
File:  line 0
By mazubieta:

Master is a bit behind right now. Melissa's branch, 'melissa', and my
'testing' branch are both where we're currently developing. I would
suggest pulling either branch, mine or her's, and then branch from either
one.

I've merged some of Melissa's changes into testing already, so maybe it'd
be best to do testing.

This should be the git workflow to do that:

- git checkout -b testing origin/testing
- git branch somenewbranch
- git checkout somenewbranch

On Fri, Dec 2, 2011 at 5:28 PM, kWhittington <
reply@reply.github.com
> wrote:

> If I pull from the master branch will i get the most recent changes or is
> it jambled up in other branches right now?
>
> -Kyle Whittington
> ________________________________________
> From: mazubieta [reply@reply.github.com]
> Sent: Friday, December 02, 2011 5:17 PM
> To: Kyle Thomas Whittington
> Subject: Re: [collaborative-text-editor] i dun goofed and somehow lost
> Andre's commit of RemoveUserCommand (01df4f3)
>
> Take your pick of what you'd like to do, just let us know what you plan to
> do. This is what we need done:
>
> 1. Contracts/Comments need to be overhauled, really for just about any
> class I created:
>
> - Client
> - Document
> - DocumentController
> - CTEUserManager
>
> 2. We should look at writing up some kind of postmortem. I initially
> thought we could each write a blurb and throw that together as a "what
> worked/didn't work for each of us", but that will be messier than just
> having one "Kumbaya" we learnt and tried to work together but failed at *
> this*, *that*, and *the other *(likewise, what worked: like today's code
> session?)
>
> 3. I'm working on integrating the RMIRegistry and actually building a
> deployable jar file for both the client and server...I really don't want to
> have to tell Nio "well first you need to open 3 terminals and ...."
>
> 4. Testing client/server. I honestly don't know the best way to do this,
> as we mentioned earlier, but if someone wanted to tackle that....well
> they'd be a saint in my eyes.
>
> On Fri, Dec 2, 2011 at 5:03 PM, kWhittington <
> reply@reply.github.com
> > wrote:
>
> > What do?
> >
> > What sort of tea needs brewing?
> >
> > -Kyle Whittington
> >
> > ---
> > Reply to this email directly or view it on GitHub:
> >
> >
> https://github.com/mazubieta/collaborative-text-editor/commit/01df4f386d304eab2770988820959f3068ae2d92#commitcomment-765472
> >
>
> ---
> Reply to this email directly or view it on GitHub:
>
> https://github.com/mazubieta/collaborative-text-editor/commit/01df4f386d304eab2770988820959f3068ae2d92#commitcomment-765501
>
> ---
> Reply to this email directly or view it on GitHub:
>
> https://github.com/mazubieta/collaborative-text-editor/commit/01df4f386d304eab2770988820959f3068ae2d92#commitcomment-765519
>