1,035
edits
Upgrade Mastodon: Difference between revisions
no edit summary
No edit summary |
No edit summary |
||
| Line 9: | Line 9: | ||
* Sync the <code>[https://github.com/NeuromatchAcademy/mastodon/tree/glitch-soc-main glitch-soc-main]</code> branch to <code>glitch-soc/mastodon:main</code>: Open the branch page and click "sync fork" | * Sync the <code>[https://github.com/NeuromatchAcademy/mastodon/tree/glitch-soc-main glitch-soc-main]</code> branch to <code>glitch-soc/mastodon:main</code>: Open the branch page and click "sync fork" | ||
** If there are any local changes that make a conflict, they can be discarded - this branch is supposed to just be a local copy of the upstream <code>main</code> branch that ''doesn't'' reflect our local changes, we will handle that in the next step. | ** If there are any local changes that make a conflict, they can be discarded - this branch is supposed to just be a local copy of the upstream <code>main</code> branch that ''doesn't'' reflect our local changes, we will handle that in the next step. | ||
[[File:Upgrading-sync-branch.png| | [[File:Upgrading-sync-branch.png|thumb]] | ||
* [https://github.com/NeuromatchAcademy/mastodon/compare/merge-upstream...NeuromatchAcademy:mastodon:glitch-soc-main Create a pull request] from <code>glitch-soc-main</code> to <code>merge-upstream</code> | * [https://github.com/NeuromatchAcademy/mastodon/compare/merge-upstream...NeuromatchAcademy:mastodon:glitch-soc-main Create a pull request] from <code>glitch-soc-main</code> to <code>merge-upstream</code> | ||
** Resolve conflicts, ensuring that [[Mastodon/Hacking|changes we have made locally]] are preserved when possible. | ** Resolve conflicts, ensuring that [[Mastodon/Hacking|changes we have made locally]] are preserved when possible. | ||