What if yours is off-line when Oren gets online to pull?

On Fri, Sep 11, 2009 at 3:01 PM, Tim Barcz <[email protected]> wrote:
> I pushed to mine and then oren pulled....
>
> is this the wrong workflow?
>
> On Fri, Sep 11, 2009 at 4:46 PM, Adam Dymitruk <[email protected]> wrote:
>>
>> requires time coordination. Why doesn't Tim just push to his branch on
>> github? Then you can pull, apply from there when you're good and
>> ready. Timezones can be a bitch..
>>
>> On Thu, Sep 10, 2009 at 6:21 AM, Ayende Rahien <[email protected]> wrote:
>> > Yeah,
>> > Tim & I just had this ping pong between us.
>> > He fixed some things, asked me to pull, and I pulled them into mine copy
>> > and
>> > push them to github.
>> >
>> > On Thu, Sep 10, 2009 at 7:34 AM, Adam Dymitruk <[email protected]>
>> > wrote:
>> >>
>> >> pull requests?
>> >>
>> >> On Tue, Sep 8, 2009 at 11:50 AM, Ayende Rahien<[email protected]>
>> >> wrote:
>> >> > I think we will take this to rhino-tools, but ideally I would like to
>> >> > see us
>> >> > managing things using pull requests.
>> >> >
>> >> > On Tue, Sep 8, 2009 at 9:48 PM, Tim Barcz <[email protected]> wrote:
>> >> >>
>> >> >> I committed some code (one cmall change with four test cases) on
>> >> >> Saturday
>> >> >> to sourceforge...did that by any chance make it in, or do I need to
>> >> >> switch
>> >> >> over to GIT and submit push there?
>> >> >>
>> >> >>
>> >> >> On Tue, Sep 8, 2009 at 1:46 PM, Ayende Rahien <[email protected]>
>> >> >> wrote:
>> >> >>>
>> >> >>> Yes
>> >> >>>
>> >> >>> On Tue, Sep 8, 2009 at 9:41 PM, Tim Barcz <[email protected]>
>> >> >>> wrote:
>> >> >>>>
>> >> >>>> Should we be looking and pulling source from Git now?
>> >> >>>>
>> >> >>>> On Tue, Sep 8, 2009 at 1:25 PM, Ayende Rahien <[email protected]>
>> >> >>>> wrote:
>> >> >>>>>
>> >> >>>>> I want to move the entire suite to Git, yes.
>> >> >>>>> Currently the SVN version has a patch that the GIT version has as
>> >> >>>>> well,
>> >> >>>>> but the 3.6 was released from the GIT version.
>> >> >>>>> On Tue, Sep 8, 2009 at 9:11 PM, Tim Barcz <[email protected]>
>> >> >>>>> wrote:
>> >> >>>>>>
>> >> >>>>>> I know Oren said he was up for it.
>> >> >>>>>>
>> >> >>>>>> I'm getting into Git on my own and would like see us take a spin
>> >> >>>>>> down
>> >> >>>>>> that road.
>> >> >>>>>>
>> >> >>>>>> On Tue, Sep 8, 2009 at 1:00 PM, Adam Dymitruk
>> >> >>>>>> <[email protected]>
>> >> >>>>>> wrote:
>> >> >>>>>>>
>> >> >>>>>>> I think Tim Barcz was asking about this in the 4.0 thread. Was
>> >> >>>>>>> the
>> >> >>>>>>> silence an indication of 'no'?
>> >> >>>>>>>
>> >> >>>>>>> --
>> >> >>>>>>> Adam
>> >> >>>>>>>
>> >> >>>>>>> http://twitter.com/adymitruk/
>> >> >>>>>>> http://www.agilevancouver.net/
>> >> >>>>>>> http://altnetvancouver.ning.com/
>> >> >>>>>>>
>> >> >>>>>>>
>> >> >>>>>>
>> >> >>>>>>
>> >> >>>>>>
>> >> >>>>>> --
>> >> >>>>>> Tim Barcz
>> >> >>>>>> Microsoft ASPInsider
>> >> >>>>>> http://timbarcz.devlicio.us
>> >> >>>>>> http://www.twitter.com/timbarcz
>> >> >>>>>>
>> >> >>>>>>
>> >> >>>>>>
>> >> >>>>>
>> >> >>>>>
>> >> >>>>>
>> >> >>>>
>> >> >>>>
>> >> >>>>
>> >> >>>> --
>> >> >>>> Tim Barcz
>> >> >>>> Microsoft ASPInsider
>> >> >>>> http://timbarcz.devlicio.us
>> >> >>>> http://www.twitter.com/timbarcz
>> >> >>>>
>> >> >>>>
>> >> >>>>
>> >> >>>
>> >> >>>
>> >> >>>
>> >> >>
>> >> >>
>> >> >>
>> >> >> --
>> >> >> Tim Barcz
>> >> >> Microsoft ASPInsider
>> >> >> http://timbarcz.devlicio.us
>> >> >> http://www.twitter.com/timbarcz
>> >> >>
>> >> >>
>> >> >>
>> >> >
>> >> >
>> >> > >
>> >> >
>> >>
>> >>
>> >>
>> >> --
>> >> Adam
>> >>
>> >> http://twitter.com/adymitruk/
>> >> http://www.agilevancouver.net/
>> >> http://altnetvancouver.ning.com/
>> >>
>> >>
>> >
>> >
>> > >
>> >
>>
>>
>>
>> --
>> Adam
>>
>> http://adventuresinagile.blogspot.com/
>> http://twitter.com/adymitruk/
>> http://www.agilevancouver.net/
>> http://altnetvancouver.ning.com/
>>
>>
>
>
>
> --
> Tim Barcz
> Microsoft ASPInsider
> http://timbarcz.devlicio.us
> http://www.twitter.com/timbarcz
>
>
> >
>



-- 
Adam

http://adventuresinagile.blogspot.com/
http://twitter.com/adymitruk/
http://www.agilevancouver.net/
http://altnetvancouver.ning.com/

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Rhino.Mocks" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/rhinomocks?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to