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

feat: add option to disable commands #35

Merged
merged 1 commit into from
Nov 28, 2022

Conversation

aspeddro
Copy link
Contributor

No description provided.

@akinsho
Copy link
Owner

akinsho commented Nov 16, 2022

Hi @aspeddro whilst I don't oppose really I'm curious why you need it? You can just opt not to use the commands no?

@aspeddro
Copy link
Contributor Author

aspeddro commented Nov 17, 2022

You can just opt not to use the commands no?

Yes, but I just want one command GitConflitct

The command names are not the same as the messages that appear in the buffer. A Base Changes case is also missing.

For those who are already using vscode or are coming from it, is better that the resolution options have the same name in the commands, i.e, Accept Current Changes => GitConflictChooseCurrentChanges.

image
Using vim.ui.select API.

This is also easier for users who are not fluent in English.

@akinsho akinsho merged commit 77faa75 into akinsho:main Nov 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants