{"thread":{"id":"39785","subject":"Git merge commit message issue","startedAt":"2015-07-06T15:45:51Z","lastAt":"2015-07-06T15:45:51Z","messageCount":1,"participants":["Andrey Hsiao"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"265558","messageId":"CAArk4YMzN_dY3SOKEjtpykunMjS5bWXYazcLxXb4TGTGP_zArw@mail.gmail.com","threadId":"39785","inReplyTo":null,"subject":"Git merge commit message issue","fromName":"Andrey Hsiao","fromEmail":"andreyhsiao@gmail.com","sentAt":"2015-07-06T15:45:51Z","receivedAt":"2015-07-06T15:45:51Z","isPatch":false,"sender":{"key":"andreyhsiao@gmail.com","avatar":"https://gravatar.com/avatar/123505aa530165f2bcbc033f7797a411e8a6f7c1322f91020233402de8421971?d=mp&s=160"},"body":"Dear list:\n\nIn the past, when we do the merge in git, if conflicts occurred, when\nwe commit, the conflict list will be appended to the default commit\nmessage automatically.\n\neg:\nConflicts:\n....a.java\n....b.java\n\nToday, after using Git 2.3.0 for a merge, it seems now the conflict\nlist was commented out by default.\n\nI just searched a bit in the release notes, don't know whether below\nitem has to do with this change.\n\n----\n\"git interpret-trailers\" learned to properly handle the \"Conflicts:\"\nblock at the end.\n----\n\nWe quite rely on the default generated conflict list to reminder us\nabout the \"history\".\n\nIs this the default behavior now (conflict list commented out)?\n\nThanks\nBest Regards\n"}]}