New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
When resolving a merge conflict allow accepting the default message #66522
Conversation
@joaomoreno Anyway I can help to get this merged soon? 🤔😁 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not super exited about this:
Comment lines ('#foo') are now shown in the input box, stripped away only when the actual commit happens.
Some of us in the team actually have single lines like #123
to refer to github issues, so this will break.
@joaomoreno I can implement what I've mentioned in a TODO comment and support ,git core.commentchar. Will that be good enough of a solution? |
How will that help, given that |
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:notifications@github.com>
Sent: Friday, August 30, 2019 12:52 PM
To: microsoft/vscode<mailto:vscode@noreply.github.com>
Cc: gawicks<mailto:hd_wicks@hotmail.com>; Author<mailto:author@noreply.github.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>.
|
Oh I see, I misread the regex. Might not be so bad. I'll give it a try. |
Thanks for this, was able to get it to work. Had to tweak it a bit to play better with the commit template but overall it works nicely. |
My pleasure. Thanks for the review |
Fixes #6403
Populates the inputBox with the default commit message when a merge conflict occurs.
Comment lines ('#foo') are now shown in the input box, stripped away only when the actual commit happens.