da0cc7c · Multigram · git.iko.soy

git.iko.soy/Multigram

Tell the sync issue to make one fixup per commit and point to PATCH.md

A single `git commit -a --fixup` puts a fix that spans two MultiGram commits into one of them, and the autosquash then stops with a modify/delete conflict. The compile-failure issue and the README now name the files per fixup, and the README links PATCH.md on the docs branch. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019mVy1fu8zBn38wHgJqmLNz

commitda0cc7c5486f71bf1dff335c867bb8d64bf5e105 authorClaude <noreply@anthropic.com> dateSun 27 Sep 2026, 10:46 (2 weeks ago) parente7f86ba

2 files changed+9−4

compare with main

unifiedsplit

README.md+6−2 scripts/sync-report.py+3−2

README.md+6−2

@@ -11,6 +11,10 @@ MultiGram is Forkgram (https://github.com/forkgram/TelegramAndroid) plus a small

1111The sync also uses `multigram-next` (the next `multigram`, while it is being checked) and tags

1212the `multigram` it replaces as `multigram-before-<version>`.

1313

14+[PATCH.md](https://github.com/iko-soy/Multigram/blob/docs/PATCH.md) on the `docs` branch says what

15+to do after a Telegram update when the sync needs a hand, and lists every MultiGram change with

16+the exact code, so the stack can be re-applied by hand.

17+

1418## Build

1519

1620**Actions > Build MultiGram > Run workflow**, ref `multigram`. It compiles the Java and Kotlin

@@ -87,8 +91,8 @@ belongs to:

8791```sh

8892git fetch origin

8993git switch -C multigram-next origin/multigram-next

90−# edit, then:

91−git commit -a --fixup=<the MultiGram commit it belongs to>

94+# edit, then, once per MultiGram commit your fix touches (name only that commit's files):

95+git commit --fixup=<the MultiGram commit it belongs to> -- <its files>

9296GIT_SEQUENCE_EDITOR=: git rebase -i --autosquash origin/forkgram

9397git push --force origin multigram-next

9498```

scripts/sync-report.py+3−2

@@ -152,8 +152,9 @@ If the log shows a runner or network hiccup, use **Re-run failed jobs** on the r

152152```sh

153153git fetch origin

154154git switch -C multigram-next origin/multigram-next

155−# fix the build, then fold the fix into the MultiGram commit it belongs to:

156−git commit -a --fixup=<that commit>

155+# fix the build, then fold each fix into the MultiGram commit it belongs to,

156+# one fixup per commit, naming that commit's files (PATCH.md 6.3 on the docs branch):

157+git commit --fixup=<that commit> -- <its files>

157158GIT_SEQUENCE_EDITOR=: git rebase -i --autosquash {snap}

158159git push --force origin multigram-next

159160```