From bbea55ea29cd103a797c858f39d307e8e3bb3eb1 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sat, 28 Sep 2024 15:00:56 +0500 Subject: [PATCH] contributor: localization admin: further clarify squsah-merges --- docs/contributor/localization-admin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributor/localization-admin.md b/docs/contributor/localization-admin.md index 4b6977ea..ee3e8ec4 100644 --- a/docs/contributor/localization-admin.md +++ b/docs/contributor/localization-admin.md @@ -45,7 +45,7 @@ are merged as explained above. Only the end of the sequence changes: - on the pull request page, find the merge button - use the button with an arrow to change it to **Create squash commit** - click **Create squash commit** - - click **Clear merge message** button to remove noise from the commit message + - remove PR description from the commit message, only keep metadata like co-authors and reviewers, like in [this example](https://codeberg.org/forgejo/forgejo/commit/e40554f89baa79d12a1ff89b434041b297afff02) - click **Create squash commit** again - merge the PR (after resolving conflicts due to the merge of the Weblate changes) - click **Reset**