JSM: Added module and TS file for ConvexObjectBreaker

[yomboprime]

Module generated by modularize.js

I've tested that the example works OK with modules, in another directory.

I've not tested the TS file (and it is manually created)

Edit:
To be merged after #16697
Related #16688

[Mugen87]

The previous merges produces a conflict. Do you mind resolving^^?

[yomboprime]

I've not made a resolve before. I know how to edit the conflicted file but no idea of the necessary git commands.

Github instructs me to do this:

Step 1: From your project repository, check out a new branch and test the changes.

git checkout -b yomboprime-jsm_convexbreaker dev
git pull https://github.com/yomboprime/three.js.git jsm_convexbreaker

Step 2: Merge the changes and update on GitHub.

git checkout dev
git merge --no-ff yomboprime-jsm_convexbreaker
git push origin dev

But I'm not sure of the final git push origin dev, because I think it should be pushed on my jsm_convexbreaker branch.
Could you help me?

Edit: I've got defined upstream

[looeee]

For a simple conflict like this you should be able to do it here. Just click the 'resolve conflicts' button, edit the file until it looks right (remove all the >>>> lines) and then mark it resolved.

[yomboprime]

For a simple conflict like this you should be able to do it here. Just click the 'resolve conflicts' button, edit the file until it looks right (remove all the >>>> lines) and then mark it resolved.

Yes, but if I knew how to do it in the console I could resolve more complex conflicts in the future, that's why I asked...

Edit: Also, I've got to add more commits, so if I resolve in this web, I must know how to integrate the changes with git in my computer.

[yomboprime]

It seems I did the merge and the resolving right, in the console. Thank you :-)

[mrdoob]

Thanks!