From a23169729abcb0c62d64d9387fba754626191856 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Thu, 3 Nov 2022 10:53:08 +0000 Subject: [PATCH] Update 'doc/release-process.md' --- doc/release-process.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/release-process.md b/doc/release-process.md index 74ffbdc..18e4a02 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -10,6 +10,9 @@ It is best to keep doc/relnotes/README.md up to date as changes and bug fixes ar See https://git.hush.is/hush/hush3/src/branch/master/doc/release-process.md#check-for-changes-on-master-that-should-be-on-dev , there is no sense repeating the exact same thing here. + +## Dealing with merge conflicts + SD very often has merge conflicts in generated translation files, because QT embeds line numbers in XML. So even if you don't change translations, but add or remove even a single line from SD source code, it can change the XML. If there are actual changes to translations on both master and dev, you are out of luck and they need to be manually dealt with. But if you want to just use whatever is on master, you can do this: ```