Posniak

[oposniak]

Compilation for VS2008

[jspricke]

Almost good. For such a small change it would be great if you could clean up the commit history. So could you do a git-rebase -i and squeeze it all into one commit?

Thanks Jochen

[jspricke]

Hi Oliver,

I'm still interested to merge your patch. Please tell me if you need help with rewriting it.

Cheers Jochen

[oposniak]

Hi Jochen,
sorry for the late reply. I just arrived at work ;)

I tried to rebase with tortoise Git. I'm not sure how to do this correct.
Do I have to reabse it to My master or is it possible to combine the commits to the branch?

Cheers Oliver

[jspricke]

Hi Oliver,

no problem, let's start with last commit you've pushed to github (i.e. ab74851 in the posniak branch). First you can reset the branch to the commit you want to push upstream, i.e. Compilation for VS2008:
% git reset d9b3b3f
Next remove the changes of the merge commit, as it's not content of your patch:
% git checkout cmake/pcl_find_ros.cmake
Finally add all local fixups to the last commit:
% git commit --amend -a
Now you should have a branch with all changes in one patch ready to send as a pull request.

Cheers Jochen

[oposniak]

Hi Jochen,
I think it worked and I sended a new pull request.

Cheers
Oliver

[jspricke]

Nop, I guess you didn't pushed the new changes to github (probably you need a push -f). Can you close the pull request, make sure the new version is actually on github and send me a message? I will have a look and if it's ok, you can send a pull request.

[oposniak]

Yes that's correct i forgot to push ;)

I pushed the changes now to my branch and I will wait for you're OK.

[jspricke]

almost, now you've merged all your old stuff with the new commit :), have a look at your history: https://github.com/oposniak/pcl/commits/posniak. What you want is a branch only containing the new patch, i.e.
05b05c1. Easiest would be to open up a new branch:
% git checkout -b windows_fix 05b05c1
and push it
% git push origin windows_fix

[oposniak]

OK. I've made a new branch. Hopefully It's OK now.

[jspricke]

Looks great, please send a pull request 👍 and sorry for being so strict with git.

[oposniak]

No problem. I've learned some things from that too:)