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

branch now can't merge to itself #8149

Closed

Conversation

ItamarYuran
Copy link
Contributor

Closes #7824

Change Description

Disabling the option of merging a branch to itself.

Background

After introducing the new flags --allow-empty & --force, users had the option of merging a branch to itself.
This modification blocks this option by checking whether the branches source and destination are equal.

Testing Details

Manually, did not create a dedicated test

Additional info

For the error, I used the already exist ErrNoChanges error and did not create a new one.

Contact Details

[email protected]

@ItamarYuran ItamarYuran added the bug Something isn't working label Sep 10, 2024
@ItamarYuran ItamarYuran linked an issue Sep 10, 2024 that may be closed by this pull request
Copy link
Contributor

@itaigilo itaigilo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since graveler is a very sensitive part of our system -
Please either add unit-tests to it,
Or describe the tests that you've made locally.

Copy link

E2E Test Results - DynamoDB Local - Local Block Adapter

13 passed

Copy link

E2E Test Results - Quickstart

10 passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

lakeFS allows merging a branch to itself
2 participants