We got rid of decks for this very reason versioning them is a nightmare, just build the deck at runtime via HSL and no more having them in the repo.
We use Git but do not merge dev. Two people cannot work on the same method.
Does using hxcfgfilconverter work on the main method? Can you merge to converted main methods? Something I haven’t tried…
I remember this conversations about automating it: Automate HxCfgFilConverter From Command Line - #5 by Huajiang
By automating hxcfgfilconverter and not using decks you might be able to merge? If I remember correctly just by opening the method file then saving again you rewrite the checksum, could execute that when you pull via an additional bash script?