[phpMyAdmin Developers] .po merge conflicts going from QA_4_6 to master

[Isaac Bennetch]

Hi,

I've made some commit to QA_4_6, which I wish to merge in to master. I
get a conflict on a .po file. According to [1], I can complete the
merge with a couple of different techniques depending on which
situation I'm in. Unfortunately, this portion doesn't make much sense
to me. Can I get some assistance with figuring out how to work
effectively with a conflict in the .po files?

Isaac

1 - https://github.com/phpmyadmin/phpmyadmin/wiki/Git#merging-translations