How do I send a patch to another developer and avoid merge conflicts?...