CLA is about licensing, CTA is about copyright, but legally licensing seems enough to avoid a dispute. > while you also retain the ability to license that code

CLA is about licensing, CTA is about copyright, but legally licensing seems enough to avoid a dispute. > while you also retain the ability to license that code to others as well Depends on the license! Always read what you sign. Get a lawyer to read it.