foster/forgejo-docs
0
0
Fork 0
mirror of https://codeberg.org/forgejo/docs.git synced 2024-11-21 17:36:59 -05:00
Code Issues Activity

contributor: localization admin: further clarify squsah-merges

Browse source
This commit is contained in:
0ko 2024-09-28 15:00:56 +05:00
parent fe7d2b2459
commit bbea55ea29
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/contributor/localization-admin.md
View file

@ -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 - on the pull request page, find the merge button
- use the button with an arrow to change it to **Create squash commit** - use the button with an arrow to change it to **Create squash commit**
- click **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 - click **Create squash commit** again
- merge the PR (after resolving conflicts due to the merge of the Weblate changes) - merge the PR (after resolving conflicts due to the merge of the Weblate changes)
- click **Reset** - click **Reset**