- split the project into multiple parts
- define interfaces
- draw parts with defined interfaces
- individual files saved to project directory(github) or individually uploaded to wiki
- Use EITHER merge OR assembly type workbench to position parts in main assembly file
"Merge conflicts" - what is this? Sounds similar to file upload conflicts that happen when multiple people merge and upload onto wiki.
If you want people to contribute, let them do it how they want - don't put up barriers to contribution. Merge and assembly can coexist in harmony. You can delete assembly constraints and save your assembly and the parts remain positionally correct. What's the difference?