search

nkinsky / ImageCamp

In vivo GCamp behavioral and data processing functions/scripts in MATLAB
1 stars 4 forks source link

Merging your fixes #2

Closed wmau closed 9 years ago

nkinsky commented 9 years ago

Sweet.

I'm still a bit confused about how all this is working. Let's talk with Dave tomorrow about how to be consistent with how we are pushing, pulling, merging, etc...

On Mon, May 11, 2015 at 4:05 PM, wmau notifications@github.com wrote:

Merged #2 https://github.com/nkinsky/ImageCamp/pull/2.

— Reply to this email directly or view it on GitHub https://github.com/nkinsky/ImageCamp/pull/2#event-302132689.

wmau commented 9 years ago

Yeah I could use some orienting.

Meanwhile, I found a helpful diagram that you can pull up on your browser of the history of your repo: https://github.com/nkinsky/ImageCamp/network. Essentially, I think I cleaned everything up such that the only existing branch/fork right now is your master branch that I merged my most recent changes to.

Will

On Mon, May 11, 2015 at 4:10 PM, nkinsky notifications@github.com wrote:

Sweet.

I'm still a bit confused about how all this is working. Let's talk with Dave tomorrow about how to be consistent with how we are pushing, pulling, merging, etc...

On Mon, May 11, 2015 at 4:05 PM, wmau notifications@github.com wrote:

Merged #2 https://github.com/nkinsky/ImageCamp/pull/2.

— Reply to this email directly or view it on GitHub https://github.com/nkinsky/ImageCamp/pull/2#event-302132689.

— Reply to this email directly or view it on GitHub https://github.com/nkinsky/ImageCamp/pull/2#issuecomment-101034176.

nkinsky commented 9 years ago

Sweet. Yeah, I've seen that also. I have the gist of what is going on, but just wanted to make sure I understood it a bit better.

On Mon, May 11, 2015 at 5:13 PM, wmau notifications@github.com wrote:

Yeah I could use some orienting.

Meanwhile, I found a helpful diagram that you can pull up on your browser of the history of your repo: https://github.com/nkinsky/ImageCamp/network. Essentially, I think I cleaned everything up such that the only existing branch/fork right now is your master branch that I merged my most recent changes to.

Will

On Mon, May 11, 2015 at 4:10 PM, nkinsky notifications@github.com wrote:

Sweet.

I'm still a bit confused about how all this is working. Let's talk with Dave tomorrow about how to be consistent with how we are pushing, pulling, merging, etc...

On Mon, May 11, 2015 at 4:05 PM, wmau notifications@github.com wrote:

Merged #2 https://github.com/nkinsky/ImageCamp/pull/2.

— Reply to this email directly or view it on GitHub https://github.com/nkinsky/ImageCamp/pull/2#event-302132689.

— Reply to this email directly or view it on GitHub https://github.com/nkinsky/ImageCamp/pull/2#issuecomment-101034176.

— Reply to this email directly or view it on GitHub https://github.com/nkinsky/ImageCamp/pull/2#issuecomment-101048413.