-
-
Notifications
You must be signed in to change notification settings - Fork 4.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Posniak #19
Posniak #19
Conversation
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 |
Hi Oliver, I'm still interested to merge your patch. Please tell me if you need help with rewriting it. Cheers Jochen |
Hi Jochen, I tried to rebase with tortoise Git. I'm not sure how to do this correct. Cheers Oliver |
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: Cheers Jochen |
Hi Jochen, Cheers |
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. |
Yes that's correct i forgot to push ;) I pushed the changes now to my branch and I will wait for you're OK. |
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. |
OK. I've made a new branch. Hopefully It's OK now. |
Looks great, please send a pull request 👍 and sorry for being so strict with git. |
No problem. I've learned some things from that too:) |
Compilation for VS2008