Update release process

doc/release-process.md

@@ -6,3 +6,18 @@ Beware of making high-risk changes too close to a new release, because they will
 
 It is best to keep doc/relnotes/README.md up to date as changes and bug fixes are made. It's more work to summarize all changes and bugfixes just before the release.
 
+## Check for changes on master that should be on dev
+
+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.
+
+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:
+
+```
+git checkout dev
+# this assumes you are using the remote called "origin"
+git pull origin dev # make sure it is up to date
+git merge --no-ff -X theirs master
+```
+
+The last command uses the "theirs" merge strategy option to the "recursive" merge strategy, which is default. See "git help merge" for more details.
+