-
Notifications
You must be signed in to change notification settings - Fork 10.2k
Closed
Milestone
Description
This was raised by @tierninho in #6984 (comment):
if you navigate to the Changes tab and uncheck the changes, the Continue rebase button is still active. I expect to be be disabled until the user checks the changed file(s).
While the "Continue rebase" state is valid feedback here, the underlying issue is that users can uncheck files that need to be handled as part of resolving conflicts. This doesn't actually affect the rebase (or merge) action, which is applied to all tracked files and ignores the checkbox status.
What I'd like to do to tighten up this behaviour is to lock down the checkbox behaviour:
- for each tracked file, mark the file as checked, disable the checkbox and add a helpful tooltip
- for each untracked file, mark the file as unchecked by default, leave the checkbox enabled (so the user can add the file to the rebase if they want?) and add a helpful tooltip
Reactions are currently unavailable
