{"thread":{"id":"53286","subject":"","startedAt":"2020-04-21T20:05:26Z","lastAt":"2020-04-21T20:05:26Z","messageCount":1,"participants":["Joshua Hudson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"395910","messageId":"CA+jjjYTJdAVMXjGWKFuigviePfdP1bLLmme_NMTuK9ZEi1HP-g@mail.gmail.com","threadId":"53286","inReplyTo":null,"subject":"","fromName":"Joshua Hudson","fromEmail":"joshudson@gmail.com","sentAt":"2020-04-21T20:05:22Z","receivedAt":"2020-04-21T20:05:26Z","isPatch":false,"sender":{"key":"joshudson@gmail.com","avatar":null},"body":"We've been getting really annoying merge conflicts that aren't\nlogically merge conflicts but git can't resolve them of itself.\n\n$ git merge origin/master\nmerge conflicts\nsrc/data/record.type2.dat\nsrc/data/record.type3.dat\nsrc/data/localization.strings.dat\n$\n\nwhere it would be quite reasonable to make a merge tool that merged\nlocalization.strings.dat only if it could also edit record.*.dat as\nwell.\nHowever, if it picked up the result of an automatic merge of\nrecord.*.dat it just won't work as it no longer has enough information\nto do the merge.\n\nThe approach is specific to the structure of these dat files, and\nwould not be generally applicable.\n"}]}