-
Notifications
You must be signed in to change notification settings - Fork 20
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
IFC-968 Prevent importing git remote branch with conflicts #5340
base: stable
Are you sure you want to change the base?
Conversation
CodSpeed Performance ReportMerging #5340 will not alter performanceComparing Summary
|
79ec267
to
3d4596e
Compare
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.
was all the work on the MultipleStagesFileRepo
in vain if the test doesn't work? 😢
What will this look like when used within Infrahub? I.e it would prevent objects to be created but when we have a proposed change will we still see that there's a conflict between main and the branch we want to merge? |
This will prevent the branch from being imported. Will it still be possible to have a proposed change if the branch isn't created in Infrahub? |
3d4596e
to
1761326
Compare
Fixes #5085