AutoMergeTool
AutoMergeTool copied to clipboard
xgouchet
Half automatic merge toolchain for git
Many iOS / Mac developer have recurring .pbxproj conflicts rising. If someone with a working version of XCode could handle this it would be great
This would be usefull for common (small) structured documents (eg: XML, Json)
This can be a little bit more tricky, as the imports are not single line canonical as it can appear in Java.
Kotlin syntax is not that different than Java's