Skip to content

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

Merged
merged 6 commits into from
Oct 21, 2024
Merged

Conversation

isc-etamarch
Copy link
Collaborator

Fixes #484

Disallow commits on default merge branch in basic mode; Remove commits and pushing form sync in basic mode on default merge branch
@codecov-commenter
Copy link

codecov-commenter commented Oct 10, 2024

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 6.25000% with 15 lines in your changes missing coverage. Please review.

Project coverage is 25.38%. Comparing base (94c92ab) to head (4e642e5).

Files with missing lines Patch % Lines
cls/SourceControl/Git/Utils.cls 0.00% 9 Missing ⚠️
cls/SourceControl/Git/Extension.cls 16.66% 5 Missing ⚠️
cls/SourceControl/Git/WebUIDriver.cls 0.00% 1 Missing ⚠️
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.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@isc-tleavitt isc-tleavitt left a 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.

Copy link
Collaborator

@isc-tleavitt isc-tleavitt left a 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
@isc-etamarch
Copy link
Collaborator Author

Added some alerts:

image image

@isc-tleavitt isc-tleavitt merged commit 89e3328 into main Oct 21, 2024
2 checks passed
@isc-tleavitt isc-tleavitt deleted the issue-484 branch October 21, 2024 14:44
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.

In basic mode, prohibit commits to default merge branch
3 participants