1,035
edits
Upgrade Mastodon: Difference between revisions
no edit summary
No edit summary |
No edit summary |
||
| Line 9: | Line 9: | ||
https://github.com/NeuromatchAcademy/mastodon/compare/glitch-soc-main...glitch-soc:mastodon:main | https://github.com/NeuromatchAcademy/mastodon/compare/glitch-soc-main...glitch-soc:mastodon:main | ||
* [https://github.com/NeuromatchAcademy/mastodon/compare/glitch-soc-main...glitch-soc:mastodon:main Create a pull request] to merge changes from <code>glitch-soc/mastodon:main</code> to <code>NeuromatchAcademy/mastodon:glitch-soc-main</code> | |||
* Resolve conflicts, ensuring that [[Mastodon/Hacking|changes we have made locally]] are preserved when possible. | |||
** If it is not possible to preserve a hack, eg. because the relevant feature has been deprecated, update the corresponding feature page and include that in the pull request description | |||
* Ensure any changes in <code>main</code> have been merged into <code>glitch-soc-main</code> | * Ensure any changes in <code>main</code> have been merged into <code>glitch-soc-main</code> | ||
== Discord == | == Discord == | ||