-
Notifications
You must be signed in to change notification settings - Fork 9
no Commits on default merge branch in basic mode #536
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
Conversation
Disallow commits on default merge branch in basic mode; Remove commits and pushing form sync in basic mode on default merge branch
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #536 +/- ##
==========================================
- Coverage 25.49% 25.38% -0.12%
==========================================
Files 18 18
Lines 2608 2624 +16
==========================================
+ Hits 665 666 +1
- Misses 1943 1958 +15 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can also commit a single modified item from the menu in basic mode - this should also be prevented.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One more thought on this: we need to consider usability for a user in basic mode trying to commit/sync. Hiding the "Commit" option and producing different output on the "Sync" option doesn't help our less-technical users. I'd rather see "Commit" enabled (so the user realizes from the menu they have uncommitted changes to the current item) and provide an alert saying they need to create a new branch to commit changes against. Similarly, on Sync, we should be really clear to the user that their work won't be committed - e.g., a big red warning box.
Tell the user that they cannot commit when in basic mode and default branch
Fixes #484