Skip to content
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

Merged
merged 1 commit into from Oct 15, 2019

Conversation

@gawicks
Copy link

gawicks commented Jan 15, 2019

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.

@msftclas

This comment has been minimized.

Copy link

msftclas commented Jan 15, 2019

CLA assistant check
All CLA requirements met.

@joaomoreno joaomoreno added this to the Backlog milestone Jan 16, 2019
@joaomoreno joaomoreno added the git label Jan 16, 2019
@gawicks

This comment has been minimized.

Copy link
Author

gawicks commented Feb 2, 2019

@joaomoreno Anyway I can help to get this merged soon? 🤔😁

Copy link
Member

joaomoreno left a comment

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.

@gawicks

This comment has been minimized.

Copy link
Author

gawicks commented Aug 27, 2019

@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?

@joaomoreno

This comment has been minimized.

Copy link
Member

joaomoreno commented Aug 30, 2019

How will that help, given that # is the default command char?

@gawicks

This comment has been minimized.

Copy link
Author

gawicks commented Aug 30, 2019

@joaomoreno

This comment has been minimized.

Copy link
Member

joaomoreno commented Aug 30, 2019

Oh I see, I misread the regex. Might not be so bad. I'll give it a try.

@joaomoreno joaomoreno modified the milestones: Backlog, October 2019 Oct 15, 2019
joaomoreno added a commit that referenced this pull request Oct 15, 2019
@joaomoreno joaomoreno merged commit 23058be into microsoft:master Oct 15, 2019
2 checks passed
2 checks passed
VS Code #20190115.8 succeeded
Details
license/cla All CLA requirements met.
Details
@joaomoreno

This comment has been minimized.

Copy link
Member

joaomoreno commented Oct 15, 2019

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.

@gawicks

This comment has been minimized.

Copy link
Author

gawicks commented Oct 16, 2019

My pleasure. Thanks for the review

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.