mirror of
https://github.com/Donkie/Spoolman.git
synced 2026-10-21 17:42:16 -05:00
Donkie
a4c113ba8e
Squash merging replaces Weblate's commits with a new one whose hash, and for multi-commit PRs whose patch-id, matches nothing Weblate knows. Its clone then rebases those commits onto a master that already contains the same strings and hits a content conflict, after which Weblate stops syncing until it is reset by hand. PR #1004 squashed two Russian commits and broke ru/common.json exactly this way. A merge commit keeps each Weblate commit reachable at its original hash, so the rebase drops them as already-upstream. Nothing required squash here: allow_merge_commit is on, the master ruleset has no linear-history rule, and human PRs already land as merge commits.