{"thread":{"id":"39784","subject":"Git merge commit message issue","startedAt":"2015-07-06T15:41:18Z","lastAt":"2015-07-06T16:33:36Z","messageCount":4,"participants":["Andrey Hsiao","Matthieu Moy"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"265557","messageId":"loom.20150706T173729-880@post.gmane.org","threadId":"39784","inReplyTo":null,"subject":"Git merge commit message issue","fromName":"Andrey Hsiao","fromEmail":"andreyhsiao@gmail.com","sentAt":"2015-07-06T15:41:18Z","receivedAt":"2015-07-06T15:41:18Z","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, \nwhen we commit, the conflict list will be appended to \nthe default commit message 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 list\n was commented out by default.\n\nI just searched a bit in the release notes, \ndon't know whether below item 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 \nto reminder us about the \"history\".\n\nIs this the default behavior now (conflict list commented out)?\n\nThanks\nBest Regards\n"},{"id":"265562","messageId":"vpqtwths1yq.fsf@anie.imag.fr","threadId":"39784","inReplyTo":"loom.20150706T173729-880@post.gmane.org","subject":"Re: Git merge commit message issue","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-07-06T16:08:45Z","receivedAt":"2015-07-06T16:08:45Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Andrey Hsiao <andreyhsiao@gmail.com> writes:\n\n> Dear list:\n>\n> In the past, when we do the merge in git, if conflicts occurred, \n> when we commit, the conflict list will be appended to \n> the default commit message automatically.\n>\n> eg:\n> Conflicts:\n> ....a.java\n> ....b.java\n>\n> Today, after using Git 2.3.0 for a merge, it seems now the conflict list\n>  was commented out by default.\n\nYes, this changed here:\n\nhttps://github.com/git/git/commit/261f315bebfa9af2d09f20211960100ff06f87cb\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"265564","messageId":"CAArk4YPvO46H2HXkPyPxwirauKXYJ1qpi_GmYMh-T2xz5EdaBQ@mail.gmail.com","threadId":"39784","inReplyTo":"vpqtwths1yq.fsf@anie.imag.fr","subject":"Re: Git merge commit message issue","fromName":"Andrey Hsiao","fromEmail":"andreyhsiao@gmail.com","sentAt":"2015-07-06T16:16:19Z","receivedAt":"2015-07-06T16:16:19Z","isPatch":false,"sender":{"key":"andreyhsiao@gmail.com","avatar":"https://gravatar.com/avatar/123505aa530165f2bcbc033f7797a411e8a6f7c1322f91020233402de8421971?d=mp&s=160"},"body":"It was a bit sad since we use scripts to do the merge, then we can\ncheck the conflict list in the log message, and assign to separate\nowners to resolve them.\n\nWould it be possible to make it as an config option?\n\nOn Tue, Jul 7, 2015 at 12:08 AM, Matthieu Moy\n<Matthieu.Moy@grenoble-inp.fr> wrote:\n> Andrey Hsiao <andreyhsiao@gmail.com> writes:\n>\n>> Dear list:\n>>\n>> In the past, when we do the merge in git, if conflicts occurred,\n>> when we commit, the conflict list will be appended to\n>> the default commit message automatically.\n>>\n>> eg:\n>> Conflicts:\n>> ....a.java\n>> ....b.java\n>>\n>> Today, after using Git 2.3.0 for a merge, it seems now the conflict list\n>>  was commented out by default.\n>\n> Yes, this changed here:\n>\n> https://github.com/git/git/commit/261f315bebfa9af2d09f20211960100ff06f87cb\n>\n> --\n> Matthieu Moy\n> http://www-verimag.imag.fr/~moy/\n"},{"id":"265568","messageId":"vpq8uats0tb.fsf@anie.imag.fr","threadId":"39784","inReplyTo":"CAArk4YPvO46H2HXkPyPxwirauKXYJ1qpi_GmYMh-T2xz5EdaBQ@mail.gmail.com","subject":"Re: Git merge commit message issue","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-07-06T16:33:36Z","receivedAt":"2015-07-06T16:33:36Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"[ Please, don't top-post on this list ]\n\nAndrey Hsiao <andreyhsiao@gmail.com> writes:\n\n> It was a bit sad since we use scripts to do the merge, then we can\n> check the conflict list in the log message, and assign to separate\n> owners to resolve them.\n>\n> Would it be possible to make it as an config option?\n\nIf a script is doing the merge, then I guess you can let your script add\nthe entry in .git/MERGE_MSG (based on something like 'git ls-files -u'\nor 'git status --porcelain | grep ^U'). This way, your script would work\nwith any version of Git.\n\nHaving a config option to restore the old behavior would make sense to\nme at least. I guess it falls in the category \"patches welcome\".\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"}]}