Better Git merge? AST merge for Java with formatting preservationgithub.com/KTH2 pointsmonperrus4 years ago