https://github.com/WeblateOrg/weblate/issues/13828 got closed as the primitive testcase passes. After more discussion upstream thinks, that the problem is their `merge_driver` for po files. There theses is that without this merge_driver our problem would be solved. The created a patch https://github.com/WeblateOrg/weblate/pull/13832 to fix this. We should test and maybe think about to implement it. - [ ] test (be nice with upstream): * patch `merge_driver` weblate/examples/git-merge-gettext-po (see /app/home/.gitconfig for complete path) * run gitsquash tests with env added `WEBLATE_MERGE_SKIP=1` hopefully gitsquash does not fail anymore for any testcase. AKA one broken testcase `testGitSquashFailing` with "Exception not raised". - [ ] after testing think about if it is worth do a permanent backport of this patch or if we just wait till we update Weblate.