da0cc7c · Multigram · git.iko.soy

git.iko.soy/Multigram

on main help sign in

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

da0cc7cClaude2 weeks ago

README.md+6−2

compare with main

unifiedsplit

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

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

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

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+

14## Build

18## Build

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

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

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

87```sh

91```sh

88git fetch origin

92git fetch origin

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

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

90−# edit, then:

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

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

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

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

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

93git push --force origin multigram-next

97git push --force origin multigram-next

94```

98```

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

152```sh

153git fetch origin

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

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

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):

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

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

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

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

158git push --force origin multigram-next

159git push --force origin multigram-next

159```

160```