146
edits
Upgrade Mastodon: Difference between revisions
Added some feature contribution guidelines from another page
(Added some feature contribution guidelines from another page) |
|||
| Line 13: | Line 13: | ||
* Merge <code>[https://github.com/NeuromatchAcademy/mastodon/tree/dev-stable dev-stable]</code> to the custom glitch branch | * Merge <code>[https://github.com/NeuromatchAcademy/mastodon/tree/dev-stable dev-stable]</code> to the custom glitch branch | ||
<syntaxhighlight lang="bash">git merge origin/dev-stable </syntaxhighlight> | <syntaxhighlight lang="bash">git merge origin/dev-stable </syntaxhighlight> | ||
* All the stable features stay on the <code>[https://github.com/NeuromatchAcademy/mastodon/tree/dev-stable dev-stable]</code> branch. To ensure that this branch stays clean, branch protections have been enabled. | |||
* Any features that have passed all the tests, have no errors (including linting errors), received approval from at least 1 reviewer, and are ready to be merged should be merged from the feature branch to the dev-stable branch in a separate process. See [[Mastodon/Hacking]] for important guidelines for contributing custom features to dev-stable. | |||
** Briefly: dev-stable branch should ideally have no merge conflicts if all the steps to keep the branch clean and stable have been followed. | |||
*** If there are merge conflicts, try and identify which features caused merge conflicts. Then request the feature developer to : | |||
**** merge upstream (glitch-soc:main) to conflicting feature branches | |||
**** create a PR to merge conflicting feature branches with dev-stable | |||
**** ensure that all checks pass, there are no linting errors, and review the code to ensure that it does what the feature is intended to do before merging to dev-stable | |||
==== History: Steps that were followed for merging glitch + 4.2RC + our instance's features ==== | ==== History: Steps that were followed for merging glitch + 4.2RC + our instance's features ==== | ||