Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
When resolving a merge conflict allow accepting the default message #66522
joaomoreno left a comment
I'm not super exited about this:
Some of us in the team actually have single lines like
Hmm I don’t see a way around that. Since the default is dictated by Git. I personally don’t see this as an issue , other git clients have this functionality as is. Besides, the issue id problem comes up if that is the first char in the line. Commit messages like “Fixed #123” (Which is the majority of them) wouldn’t be affected. /H From: João Moreno<mailto:firstname.lastname@example.org> Sent: Friday, August 30, 2019 12:52 PM To: microsoft/vscode<mailto:email@example.com> Cc: gawicks<mailto:firstname.lastname@example.org>; Author<mailto:email@example.com> Subject: Re: [microsoft/vscode] When resolving a merge conflict allow accepting the default message (#66522) How will that help, given that # is the default command char? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<#66522?email_source=notifications&email_token=AALJWE3PP43XGX6VFTJILZ3QHDDDJA5CNFSM4GQBJJ32YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD5QZO2I#issuecomment-526489449>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AALJWE5XVHQDQWP3WTRAX6LQHDDDJANCNFSM4GQBJJ3Q>.