diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-08-30 13:35:20 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-08-30 13:35:20 +0100 |
| commit | 5f93b10fb70d6c61865d37427fbe80e8a0d67f48 (patch) | |
| tree | ab1635558ad54c650310d7a0f463b2af2bac4689 /CONTRIBUTING.md | |
| parent | align ApNoteService updateNote with createNote (diff) | |
| download | sharkey-5f93b10fb70d6c61865d37427fbe80e8a0d67f48.tar.gz sharkey-5f93b10fb70d6c61865d37427fbe80e8a0d67f48.tar.bz2 sharkey-5f93b10fb70d6c61865d37427fbe80e8a0d67f48.zip | |
extra step when checking merges from upstream
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b2c6d1a33b..a50b550b3a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -611,6 +611,8 @@ seems to do a decent job) `packages/frontend/src/pages/timeline.vue`, `packages/frontend/src/ui/deck/tl-column.vue`, `packages/frontend/src/widgets/WidgetTimeline.vue`) +* check the changes against our `develop` (`git diff develop`) and + against Misskey (`git diff misskey/develop`) * re-generate `misskey-js` (`pnpm build-misskey-js-with-types`) and commit * build the frontend: `rm -rf built/; NODE_ENV=development pnpm --filter=frontend build` (the `development` tells it to keep some of the original |