search

CentroEPiaggio / kuka-lwr

Software related to the KUKA LWR 4+: for real and for simulation.
The Unlicense
101 stars 81 forks source link

Fixing compilation issues #33

Closed nrontsis closed 9 years ago

nrontsis commented 9 years ago

Fixes #32

carlosjoserg commented 9 years ago

And thanks for the PR. However, it has several other commits, could you PR only with c64cdb22264d692f62c8f0a863bc551c6b577b28? If it's too much trouble, let me know.

nrontsis commented 9 years ago

Sorry about that, I am newcomer to git. I am closing and creating a new PR with only https://github.com/CentroEPiaggio/kuka-lwr/commit/c64cdb22264d692f62c8f0a863bc551c6b577b28.

Could you however explain me if there would be any difference if you did git merge --squash on this pull request?

carlosjoserg commented 9 years ago

Just an IKEA solution: transfer the work to the customer ; )

The main reason is that a rule of thumb for squashing is that you shouldn't do it in the remote/common repo, but in your local, in this case, your fork. If for any reason, anyone clone after I merge the PR in the remote, and start working and branch from any of the commits that I'll squash later, there might be conflicts. This is a very small project with a small community, and I could probably do the squash&push in less than 10 min if the power supply doesn't die, so this problem is not likely to occur. But it is safer anyway.

nrontsis commented 9 years ago

Hahaha :smile:

I see your point, thank you for the explanation.