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

"Resolution or (A)bort?" unclear message #109

Open
nikitabobko opened this issue Dec 23, 2021 · 1 comment
Open

"Resolution or (A)bort?" unclear message #109

nikitabobko opened this issue Dec 23, 2021 · 1 comment
Labels
enhancement New feature or request

Comments

@nikitabobko
Copy link

nikitabobko commented Dec 23, 2021

I faced merge conflict during rebase with revise. It says:

pick   16447b3216ee  [jps] [202 IDEA only] Fix compilation
pick   ffa7cee0d574  [jps] Fix compilation JDK Path Kotlin extensions
pick   490c36a87657  [jps] Fix Kotlin JPS commits compilation after cherry-pick from intellij/master
pick   0d782d7c72b7  Compilation fixes
Deletion conflict for '/jps'
  (1) Compilation fixes: deleted
  (2) Fix compilation after removing pre-release flag from compiler (2): modified
Resolution or (A)bort?

"Resolution or (A)bort?" is completely unclear. it looks like "Abort" is the only possible option ("Resolution" doesn't have its first letter in brackets). But if "(A)bort" is the only option then why does it ask me? Why not just abort? I tried typing "Resolution" but it aborts anyway.

@mystor mystor added the enhancement New feature or request label Dec 23, 2021
@mystor
Copy link
Owner

mystor commented Dec 23, 2021

The resolution option is intended to be one of the listed values (1 or 2) - I agree that the prompt could be made more clear, as the fact those are valid inputs is not clear here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants