From 5f93b10fb70d6c61865d37427fbe80e8a0d67f48 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Fri, 30 Aug 2024 13:35:20 +0100
Subject: [PATCH] extra step when checking merges from upstream

---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

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