On Tue, Mar 11, 2025 at 10:10:51PM +0900, Simon Richter wrote:
I'm on mobile, so only a quick reply: merging should be done with msgmerge as well — you need to call it twice, once with the po files from both branches, and once again with the pot file to fix all the location comments and fuzzy flags.
That sounds really interesting. Did anybody include this in git like for the excellent dpkg-mergechangelogs, so that it can be done automatically?
If doing that automatically doesn't work, I would love to see a complete usecase.
Alternatively, you can define a filter in git to remove(!) locations on checkout and restore them from the pot file on commit, that solves the majority of conflicts.
How would that look like? git filters are a mystery for those wizards. Greetings Marc -- ----------------------------------------------------------------------------- Marc Haber | "I don't trust Computers. They | Mailadresse im Header Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402 Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421
