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.

Sign up for GitHub

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

Jump to bottom

Git: When resolving a merge conflict allow accepting the default commit message #6403

Closed
mohsen1 opened this issue May 16, 2016 · 4 comments · Fixed by #66522
Closed

Git: When resolving a merge conflict allow accepting the default commit message #6403

mohsen1 opened this issue May 16, 2016 · 4 comments · Fixed by #66522
Assignees
@joaomoreno
Labels
feature-request Request for new features or functionality git GIT issues help wanted Issues identified as good community contribution opportunities verification-needed Verification of issue is requested verified Verification succeeded
Milestone
October 2019

Comments

@mohsen1
Copy link

mohsen1 commented May 16, 2016

  • VSCode Version: 1.1.1
  • OS Version: OS X

Steps to Reproduce:

  1. get into a merge conflict
  2. Try accepting Git's default message. It's equal to git commit --no-edit
  3. There is no way to do that!
@isidorn isidorn added feature-request Request for new features or functionality git GIT issues labels May 17, 2016
@joaomoreno joaomoreno added this to the Backlog milestone May 24, 2016
This was referenced Jul 5, 2016
Closed
Closed
@joaomoreno joaomoreno added the help wanted Issues identified as good community contribution opportunities label Apr 25, 2017
@joaomoreno joaomoreno removed their assignment Apr 25, 2017
@suan
Copy link

suan commented Jun 1, 2017

Will mention that it's also equivalent to git commit and saving the default message that shows up in your editor - hence a very common workflow

@joaomoreno joaomoreno changed the title When resolving a merge conflict allow accepting Git's default commit message Git: When resolving a merge conflict allow accepting the default commit message Sep 17, 2018
@borekb
Copy link

borekb commented Oct 5, 2018

My workaround is to invoke git commit from a terminal. Maybe if the commit message field is empty, VSCode could just call git commit as well and leave it up to user's configuration what happens (in my case, it would open a text editor from my EDITOR system variable, which is fine).

@gawicks gawicks mentioned this issue Jan 15, 2019
Merged
@cbryan-risklens
Copy link

Has the pull request #66522 been reviewed yet? Can it be pulled in?

@joaomoreno joaomoreno self-assigned this Oct 9, 2019
@joaomoreno joaomoreno modified the milestones: Backlog, October 2019 Oct 15, 2019
@joaomoreno joaomoreno added the verification-needed Verification of issue is requested label Oct 15, 2019
@joaomoreno
Copy link
Member

Verification:

When having a merge commit, VS Code should now automatically populate the input box with the default git merge commit message, so the user can just accept it.

@roblourens roblourens added the verified Verification succeeded label Oct 29, 2019
This was referenced Nov 8, 2019
Closed
Closed
@vscodebot vscodebot bot locked and limited conversation to collaborators Nov 29, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@joaomoreno joaomoreno

Labels
feature-request Request for new features or functionality git GIT issues help wanted Issues identified as good community contribution opportunities verification-needed Verification of issue is requested verified Verification succeeded
Projects
None yet
Milestone
October 2019
Development

Successfully merging a pull request may close this issue.

When resolving a merge conflict allow accepting the default message gawicks/vscode
7 participants
@joaomoreno @borekb @suan @roblourens @mohsen1 @isidorn @cbryan-risklens