Closed thomas-lemaire closed 7 years ago
Better to do a "squash and merge"
Nope, keep individual commits please: it's much easier to merge in case of conflicts.
mmm the "squash and merge" is the policy agreed with the sofa consortium team, much cleanerand understandable history, prevent from having a "plat de spaghettis"
Squashing is nice for a release branch, but for a dev branch this should be avoided.
When squashing, you explicitly prevent git from merging automatically later potential conflicts by finding common ancestors, for instance when two PR touch the same files.
Also, you're going to have fun times tracking down regressions when git bisect
points at your squashed commit.
So... at your own risks ;-)
some discussion went on at:
This PR changes the behavior of helper::vector to make it closer to svector
As a consequence the serialization/deserialization on the python side (SofaPython plugin) is updated accordingly. Now the repr() of a python object is used to serialize it into a string in the Node.createObject() method if it is not a string already.
Later on, code can be cleaned-up:
This PR:
Reviewers will merge only if all these checks are true.