The ObjectMapper in NomadJson is configured to serialize dates using the SimpleDateFormat "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", but this is only correct when the timezone associated with the Date/DateFormat instance is UTC. When another time z...
The proper solution for this problem is to compare the normalized versions of the two files that have differences, and base your merge decisions on this. In order to see what git thinks changed, it’s useful to change git-diff’s understanding of what constitutes a word by changing the ...