How about rebasing to only include aeca741? The rest are in-progress feat pyramid commits that aren't ready for master. Once you rebase you can git push -f to your fork and the pull request will update. I'll merge it then.

You should make a feat-pyramid branch and work in that instead of master. It'll be cleaner for you to update as the current round of pull requests I'm processing are merged in.

Sure. Evan, can we do this together tomorrow?

I'll be in 7SDH at 2-3pm tomorrow to discuss caffe feat-pyramids with
Sergey (et al?) tomorrow anyway.

Forrest

On Wed, Jan 15, 2014 at 2:27 PM, Evan Shelhamer [email protected]:

How about rebasing https://help.github.com/articles/interactive-rebaseto only include
aeca741 aeca741? The rest are
in-progress feat pyramid commits that aren't ready for master. Once you
rebase you can git push -f to your fork and the pull request will update.
I'll merge it then.

You should make a feat-pyramid branch and work in that instead of master.
It'll be cleaner for you to update as the current round of pull requests
I'm processing are merged in.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/34#issuecomment-32422461
.

Forrest Iandola
http://www.forrestiandola.com

I'm in New York at the moment, but I'm still happy to walk you through the pull request change.

# make a branch with all the commits in your master
git checkout master
git branch feat-pyramid 

# git rebase will open your default editor
# with a manifest of commits for you to edit
# delete all of the commits after aeca741
git rebase --interactive aeca741^
# force push your rebased master branch to update this pull request
# where origin is whatever you named your fork
git push -f origin master

# work in feat-pyramid
git checkout feat-pyramid

p.s. Looks like a lot of coding progress on the feature pyramids!

Evan,

thanks a lot.

after I do these commands...

1. feat-pyramid branch will be reverted to aeca741, correct?
2. Will my master still be up to the current aeca741?

tl;dr, after I do this stuff, where will I see my latest version?

Forrest

On Thu, Jan 16, 2014 at 7:51 AM, Evan Shelhamer [email protected]:

I'm in New York at the moment, but I'm still happy to walk you through the
pull request change.

make a branch with all the commits in your master

git checkout master
git branch feat-pyramid

git rebase will open your default editor

with a manifest of commits for you to edit

delete all of the commits after aeca741

git rebase --interactive aeca741^

force push your rebased master branch to update this pull request

where origin is whatever you named your fork

git push -f origin master

work in feat-pyramid

git checkout feat-pyramid

p.s. Looks like a lot of coding progress on the feature pyramids!

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/34#issuecomment-32480929
.

Forrest Iandola
http://www.forrestiandola.com

Forrest,

master will be back to aeca741
feat-pyramid will have all the latest

git branch makes the branch without checking it out. you're reverting and
force pushing your master, after saving the current state as the
feat-pyramid branch.

Make sense? Happy to clear up more if needed.

Le jeudi 16 janvier 2014, Forrest Iandola [email protected] a
écrit :

Evan,

thanks a lot.

after I do these commands...

1. feat-pyramid branch will be reverted to aeca741, correct?
2. Will my master still be up to the current aeca741?

tl;dr, after I do this stuff, where will I see my latest version?

Forrest

On Thu, Jan 16, 2014 at 7:51 AM, Evan Shelhamer <[email protected]<javascript:_e({}, 'cvml', '[email protected]');>>wrote:

I'm in New York at the moment, but I'm still happy to walk you through
the
pull request change.

make a branch with all the commits in your master

git checkout master
git branch feat-pyramid

git rebase will open your default editor

with a manifest of commits for you to edit

delete all of the commits after aeca741

git rebase --interactive aeca741^

force push your rebased master branch to update this pull request

where origin is whatever you named your fork

git push -f origin master

work in feat-pyramid

git checkout feat-pyramid

p.s. Looks like a lot of coding progress on the feature pyramids!

—
Reply to this email directly or view it on GitHub<
https://github.com/BVLC/caffe/pull/34#issuecomment-32480929>
.

Forrest Iandola
http://www.forrestiandola.com

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/34#issuecomment-32545001
.

Hi Evan,

All right, the pull request should be ready to go.
The power_wrapper pull request change is now the only change in my master.

My featpyramid experimental code is now in my 'featpyramid' branch.

Thanks for the help!

Forrest

On Thu, Jan 16, 2014 at 2:03 PM, Evan Shelhamer [email protected]:

Forrest,

master will be back to aeca741
feat-pyramid will have all the latest

git branch makes the branch without checking it out. you're reverting and
force pushing your master, after saving the current state as the
feat-pyramid branch.

Make sense? Happy to clear up more if needed.

Le jeudi 16 janvier 2014, Forrest Iandola [email protected] a
écrit :

Evan,

thanks a lot.

after I do these commands...

1. feat-pyramid branch will be reverted to aeca741, correct?
2. Will my master still be up to the current aeca741?

tl;dr, after I do this stuff, where will I see my latest version?

Forrest

On Thu, Jan 16, 2014 at 7:51 AM, Evan Shelhamer <
[email protected]<javascript:_e({}, 'cvml', '
[email protected]');>>wrote:

I'm in New York at the moment, but I'm still happy to walk you through
the
pull request change.

make a branch with all the commits in your master

git checkout master
git branch feat-pyramid

git rebase will open your default editor

with a manifest of commits for you to edit

delete all of the commits after aeca741

git rebase --interactive aeca741^

force push your rebased master branch to update this pull request

where origin is whatever you named your fork

git push -f origin master

work in feat-pyramid

git checkout feat-pyramid

p.s. Looks like a lot of coding progress on the feature pyramids!

—
Reply to this email directly or view it on GitHub<
https://github.com/BVLC/caffe/pull/34#issuecomment-32480929>
.

Forrest Iandola
http://www.forrestiandola.com

—
Reply to this email directly or view it on GitHub<
https://github.com/BVLC/caffe/pull/34#issuecomment-32545001>
.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/34#issuecomment-32551941
.

Forrest Iandola
http://www.forrestiandola.com