https://wiki.opensourceecology.org/index.php?action=history&feed=atom&title=Talk%3AMerge_Workflow 2026-04-17T01:31:11Z Revision history for this page on the wiki MediaWiki 1.39.13 https://wiki.opensourceecology.org/index.php?title=Talk:Merge_Workflow&diff=209523&oldid=prev 2020-01-24T00:05:30Z

<p><span dir="auto"><span class="autocomment">False Dichotomy</span></span></p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 00:05, 24 January 2020</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>=False Dichotomy=</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>=False Dichotomy=</div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>#split the project into multiple parts</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>#split the project into multiple parts</div></td></tr> <tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>#define <del style="font-weight: bold; text-decoration: none;">interfac</del></div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>#define <ins style="font-weight: bold; text-decoration: none;">interfaces</ins></div></td></tr> <tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del style="font-weight: bold; text-decoration: none;">es</del></div></td><td colspan="2" class="diff-side-added"></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>#draw parts with defined interfaces</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>#draw parts with defined interfaces</div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>#individual files saved to project directory(github) or individually uploaded to wiki</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>#individual files saved to project directory(github) or individually uploaded to wiki</div></td></tr> </table>

Aidan Williamson https://wiki.opensourceecology.org/index.php?title=Talk:Merge_Workflow&diff=209521&oldid=prev 2020-01-24T00:04:42Z

<p>moved from main page</p> <p><b>New page</b></p><div>=False Dichotomy=<br /> #split the project into multiple parts<br /> #define interfac<br /> es<br /> #draw parts with defined interfaces<br /> #individual files saved to project directory(github) or individually uploaded to wiki<br /> # Use &#039;&#039;&#039;EITHER&#039;&#039;&#039; merge &#039;&#039;&#039;OR&#039;&#039;&#039; assembly type workbench to position parts in main assembly file<br /> <br /> &quot;Merge conflicts&quot; - what is this? Sounds similar to &#039;&#039;file upload conflicts&#039;&#039; that happen when multiple people merge and upload onto wiki. <br /> <br /> If you want people to contribute, let them do it how they want - don&#039;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&#039;s the difference?<br /> <br /> [[User:Aidan Williamson|Aidan Williamson]] ([[User talk:Aidan Williamson|talk]]) 00:04, 24 January 2020 (UTC)</div>

Aidan Williamson