diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-04-11 13:50:38 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-04-11 14:03:56 +0100 |
| commit | 1cae3bfa3b24e3de322eebee283c531918ae0ebd (patch) | |
| tree | f75f2236175ca4910fe62edb861c624dd1f8d491 | |
| parent | re-generate misskey-js (diff) | |
| download | sharkey-1cae3bfa3b24e3de322eebee283c531918ae0ebd.tar.gz sharkey-1cae3bfa3b24e3de322eebee283c531918ae0ebd.tar.bz2 sharkey-1cae3bfa3b24e3de322eebee283c531918ae0ebd.zip | |
update instructions
| -rw-r--r-- | CONTRIBUTING.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95f0383c70..25e259a285 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -549,7 +549,9 @@ https://github.com/misskey-dev/misskey.git`), then: git checkout -m merge/$(date +%Y-%m-%d) # or whatever git merge --no-ff misskey/develop -fix conflicts and *commit*! +fix conflicts and *commit*! (conflicts in `pnpm-lock.yaml` can usually +be fixed by running `pnpm install`, it detects conflict markers and +seems to do a decent job) *after that commit*, do all the extra work, on the same branch: @@ -560,6 +562,7 @@ fix conflicts and *commit*! * from `ApNoteService.createNote` to `ApNoteService.updateNote` * from `endoints/notes/create.ts` to `endoints/notes/edit.ts` * 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 * run lint `pnpm --filter=backend lint` + `pnpm --filter=frontend eslint` and fix as much as you can |