sfdx-plugin-easymerge (npm): plugin for sfdx which formats the metadata for easier merging and conflict handling
Keywords: sfdx-plugin