Introduce script to automatically resolve conflicts after treewide changes (such as reformats)

Introduce script to automatically resolve conflicts after treewide changes (such as reformats) #34109