Can someone explain the .resx file value for conflicts

[Lathander]

Recently had a major conflict with some .resx files that were in recent updates. I've made some changes to editors and I'm wondering what the hell this gobbly-gook is, and if I can keep my block and toss out the merged in junk. Example Below.

 

Spoiler

        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAY
        CwAAAk1TRnQBSQFMAgEBAgEAAVgBAQFYAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
        CwAAAk1TRnQBSQFMAgEBAgEAAWABAQFgAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
        AwABEAMAAQEBAAEgBgABEFoAA/YB/wP2Af8D9gH/A/YB/wP2Af8D9gH/A/YB/wP2Af8D9gH/A/YB/wP2
        Af8D9gH/A/YB/4wAAyEBMAMqAUADKgFAAyoBQAMqAUADKgFAAyoBQAMqAUADKgFAAyoBQAMqAUADKgFA
        AyoBQAMqAUAIAAP2Af8DPQH/Az0B/wM9Af8DPQH/Az0B/wM9Af8DPQH/Az0B/wM9Af8DPQH/Az0B/wP2
        AyoBQAMqAUAIAAP2Af8DPAH/AzwB/wM8Af8DPAH/AzwB/wM8Af8DPAH/AzwB/wM8Af8DPAH/AzwB/wP2
        Af+IAAMMARAB7gHyAfQB/wP2Af8D9gH/A/YB/wP2Af8D9gH/A/YB/wP2Af8D9gH/A/YB/wP2Af8D9gH/
        A/YB/wP2Af8IAAP2Af8DPQH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHx
        Ae8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/Az0B/wP2Af+IAANAAXAByAHeAewB/wFPAbYB3AH/
        AU8BtgHcAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2
        AdwB/wFPAbYB3AH/AbYB0wHmAf8BTwG2AdwB/wP2Af8IAAP2Af8DPQH/AfEB7wHwAf8B8QHvAfAB/wHx
        Ae8B8AH/AcUBxAHFAf8BhAKDAf8BxQHEAcUB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wM9Af8D9gH/
        iAADXAHfAZEBwgHhAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHc
        Af8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BiQG9Ad8B/wHxAe8B8AH/AU8BtgHcAf8D9gH/CAAD9gH/
        Az0B/wHxAe8B8AH/AdsB2QHaAf8BdAJzAf8BmgKZAf8DPQH/AZoCmQH/AXQCcwH/AdsB2QHaAf8B8QHv
        AfAB/wM9Af8D9gH/hAADKgFAAd8B6gHxAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wFP
        AbYB3AH/AU8BtgHcAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wHTAeEB6wH/AfEB7wHw
        Af8BTwG2AdwB/wP2Af8IAAP2Af8DPQH/AfEB7wHwAf8DPQH/AdsB2QHaAf8B8QHvAfAB/wM9Af8B8QHv
        AfAB/wHbAdkB2gH/Az0B/wHxAe8B8AH/Az0B/wP2Af+EAANRAZ8BqQHOAeYB/wFPAbYB3AH/AU8BtgHc
        Af8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wGf
        AcgB4gH/AfEB7wHwAf8B8QHvAfAB/wFPAbYB3AH/A/YB/wgAA/YB/wM9Af8B8QHvAfAB/wM9Af8B8QHv
        AfAB/wHxAe8B8AH/Az0B/wHxAe8B8AH/AfEB7wHwAf8DPQH/AfEB7wHwAf8DPQH/A/YB/4QAA/YB/wGC
        AboB3gH/AU8BtgHcAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHc
        Af8BTwG2AdwB/wFPAbYB3AH/AeIB6AHuAf8B8QHvAfAB/wHxAe8B8AH/AU8BtgHcAf8D9gH/CAAD9gH/
        Az0B/wHxAe8B8AH/Az0B/wHFAcQBxQH/AWkBaAFpAf8BmgKZAf8BaQFoAWkB/wHFAcQBxQH/Az0B/wHx
        Ae8B8AH/Az0B/wP2Af+EAAP2Af8D9gH/AU8BtgHcAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHv
        A/YB/wP2Af8IAAP2Af8DPAH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHx
        Ae8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AzwB/wP2Af+IAANAAXAByAHeAewB/wFOAbYB3AH/
        AU4BtgHcAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2
        AdwB/wFOAbYB3AH/AbYB0wHmAf8BTgG2AdwB/wP2Af8IAAP2Af8DPAH/AfEB7wHwAf8B8QHvAfAB/wHx
        Ae8B8AH/AcUBxAHFAf8BhAKDAf8BxQHEAcUB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wM8Af8D9gH/
        iAADXAHfAZEBwgHhAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHc
        Af8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BiQG9Ad8B/wHxAe8B8AH/AU4BtgHcAf8D9gH/CAAD9gH/
        AzwB/wHxAe8B8AH/AdsB2QHaAf8BcwJyAf8BmgKZAf8DPAH/AZoCmQH/AXMCcgH/AdsB2QHaAf8B8QHv
        AfAB/wM8Af8D9gH/hAADKgFAAd8B6gHxAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wFO
        AbYB3AH/AU4BtgHcAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wHTAeEB6wH/AfEB7wHw
        Af8BTgG2AdwB/wP2Af8IAAP2Af8DPAH/AfEB7wHwAf8DPAH/AdsB2QHaAf8B8QHvAfAB/wM8Af8B8QHv
        AfAB/wHbAdkB2gH/AzwB/wHxAe8B8AH/AzwB/wP2Af+EAANRAZ8BqQHOAeYB/wFOAbYB3AH/AU4BtgHc
        Af8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wGf
        AcgB4gH/AfEB7wHwAf8B8QHvAfAB/wFOAbYB3AH/A/YB/wgAA/YB/wM8Af8B8QHvAfAB/wM8Af8B8QHv
        AfAB/wHxAe8B8AH/AzwB/wHxAe8B8AH/AfEB7wHwAf8DPAH/AfEB7wHwAf8DPAH/A/YB/4QAA/YB/wGC
        AboB3gH/AU4BtgHcAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHc
        Af8BTgG2AdwB/wFOAbYB3AH/AeIB6AHuAf8B8QHvAfAB/wHxAe8B8AH/AU4BtgHcAf8D9gH/CAAD9gH/
        AzwB/wHxAe8B8AH/AzwB/wHFAcQBxQH/AWgBZwFoAf8BmgKZAf8BaAFnAWgB/wHFAcQBxQH/AzwB/wHx
        Ae8B8AH/AzwB/wP2Af+EAAP2Af8D9gH/AU4BtgHcAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHv
        AfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/
        AU8BtgHcAf8D9gH/CAAD9gH/Az0B/wHxAe8B8AH/Az0B/wF0AnMB/wHmAeQB5QH/AfEB7wHwAf8B5gHk
        AeUB/wF0AnMB/wM9Af8B8QHvAfAB/wM9Af8D9gH/iAAD9gH/AU8BtgHcAf8B8QHvAfAB/wHxAe8B8AH/
        AU4BtgHcAf8D9gH/CAAD9gH/AzwB/wHxAe8B8AH/AzwB/wFzAnIB/wHmAeQB5QH/AfEB7wHwAf8B5gHk
        AeUB/wFzAnIB/wM8Af8B8QHvAfAB/wM8Af8D9gH/iAAD9gH/AU4BtgHcAf8B8QHvAfAB/wHxAe8B8AH/
        AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHv
        AfAB/wHxAe8B8AH/AU8BtgHcAf8D9gH/CAAD9gH/Az0B/wHxAe8B8AH/AdsB2QHaAf8BdAJzAf8BmgKZ
        Af8B2wHZAdoB/wGaApkB/wF0AnMB/wHbAdkB2gH/AfEB7wHwAf8DPQH/A/YB/4gAA/YB/wFPAbYB3AH/
        AfAB/wHxAe8B8AH/AU4BtgHcAf8D9gH/CAAD9gH/AzwB/wHxAe8B8AH/AdsB2QHaAf8BcwJyAf8BmgKZ
        Af8B2wHZAdoB/wGaApkB/wFzAnIB/wHbAdkB2gH/AfEB7wHwAf8DPAH/A/YB/4gAA/YB/wFOAbYB3AH/
        AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHv
        AfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wFPAbYB3AH/A/YB/wgAA/YB/wM9Af8B8QHvAfAB/wHx
        AfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wFOAbYB3AH/A/YB/wgAA/YB/wM8Af8B8QHvAfAB/wHx
        Ae8B8AH/AfEB7wHwAf8BxQHEAcUB/wGEAoMB/wHFAcQBxQH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/
        Az0B/wP2Af+IAAP2Af8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wHiAegB7gH/AfEB7wHw
        Af8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8BTwG2AdwB/wP2
        Af8IAAP2Af8DPQH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/
        Az0B/wM9Af8DPQH/A4YB/wOuAe+IAAP2Af8D9gH/A/YB/wP2Af8BigG+Ad8B/wGnAcsB5AH/AfEB7wHw
        Af8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8BTwG2AdwB/wP2
        Af8IAAP2Af8DPQH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/
        Az0B/wM9Af8DhgH/A64B7wMhATCUAANcAd8ByAHeAewB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wFP
        AbYB3AH/AU8BtgHcAf8BTwG2AdwB/wFPAbYB3AH/AU8BtgHcAf8BTwG2AdwB/wP2Af8IAAP2Af8DPQH/
        AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/Az0B/wOGAf8DrgHv
        AzwB/wP2Af+IAAP2Af8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wHiAegB7gH/AfEB7wHw
        Af8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8BTgG2AdwB/wP2
        Af8IAAP2Af8DPAH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/
        AzwB/wM8Af8DPAH/A4YB/wOkAe+IAAP2Af8D9gH/A/YB/wP2Af8BigG+Ad8B/wGnAcsB5AH/AfEB7wHw
        Af8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8BTgG2AdwB/wP2
        Af8IAAP2Af8DPAH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/
        AzwB/wM8Af8DhgH/A6QB7wMhATCUAANcAd8ByAHeAewB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wFO
        AbYB3AH/AU4BtgHcAf8BTgG2AdwB/wFOAbYB3AH/AU4BtgHcAf8BTgG2AdwB/wP2Af8IAAP2Af8DPAH/
        AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AfEB7wHwAf8B8QHvAfAB/wHxAe8B8AH/AzwB/wOGAf8DpAHv
        AyEBMJgAAzoBYAP2Af8D9gH/A/YB/wP2Af8D9gH/A/YB/wP2Af8D9gH/A/YB/wP2Af8D9gH/CAAD9gH/
        Az0B/wM9Af8DPQH/Az0B/wM9Af8DPQH/Az0B/wOGAf8DrgHvAyEBMNQAA/YB/wP2Af8D9gH/A/YB/wP2
        Af8D9gH/A/YB/wP2Af8DrgHvAyEBMJAAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcA
        AzwB/wM8Af8DPAH/AzwB/wM8Af8DPAH/AzwB/wOGAf8DpAHvAyEBMNQAA/YB/wP2Af8D9gH/A/YB/wP2
        Af8D9gH/A/YB/wP2Af8DpAHvAyEBMJAAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcA
        A/8BAAL/AcABAQQAAcABAAHAAQEEAAGAAQABwAEBBAABgAEAAcABAQQAAYABAAHAAQEGAAHAAQEGAAHA
        AQEGAAHAAQEGAAHAAQEEAAGAAQABwAEBBAABgAEAAcABAQQAAYABAAHAAQEEAAGAAQABwAEBBAAB8AEA
        AcABAwQAAfABAAHAAQcEAAL/AcABDwQACw==

 

 

[jcsnider]

That's images and other data that are embedded in the forms....

 

Now the best way to handle merge conflicts on that, I don't really know off the top of my head.

[Lathander]

I'm guessing even if someone goes into the forms and moves one control two pixels that it creates conflicts. The changes were inside the frmClass.resx. Basically I deleted the changes and kept my version, there weren't any other conflicts that came up that I couldn't manage. I am guessing that I could be missing out on added fields or additional controls when updates add those to forms I have already modified. I am thinking the best course of action would be for me to build out the changes on a fresh master and look at what seems different from that editor to my version, and manually add those controls if I want/need them. But I could be wrong..

[Cheshire]

These things are tricky, I recently yolo'd some of these changes together by hitting merge and praying. Seemed to work after I opened the forms in the editor once.