You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
The text was updated successfully, but these errors were encountered:
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.
I faced merge conflict during rebase with revise. It says:
"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.
The text was updated successfully, but these errors were encountered: