From 158a9b3692c91c38a647ceda54e6e229698aff77 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 25 Apr 2024 11:56:35 +0100
Subject: [PATCH] update merge guide

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 25e259a285..d40a518ec0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -564,6 +564,9 @@ seems to do a decent job)
   * from `MkNote*` to `SkNote*` (if sensible)
 * re-generate `misskey-js`: `pnpm build-misskey-js-with-types`
 * run tests `pnpm test` and fix as much as you can
+  * right now `megalodon` doesn't pass its tests, you probably need to
+    run `pnpm --filter=backend test` (requires a test database, [see
+    above](#testing)) and `pnpm --filter=frontend test`
 * run lint `pnpm --filter=backend lint` + `pnpm --filter=frontend
   eslint` and fix as much as you can