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

IFC-968 Prevent importing git remote branch with conflicts #5340

Open
wants to merge 9 commits into
base: stable
Choose a base branch
from

Conversation

gmazoyer
Copy link
Contributor

Fixes #5085

@github-actions github-actions bot added the group/backend Issue related to the backend (API Server, Git Agent) label Dec 31, 2024
Copy link

codspeed-hq bot commented Dec 31, 2024

CodSpeed Performance Report

Merging #5340 will not alter performance

Comparing gma-20241231-5085 (1761326) with stable (42703f5)

Summary

✅ 10 untouched benchmarks

@gmazoyer gmazoyer force-pushed the gma-20241231-5085 branch 3 times, most recently from 79ec267 to 3d4596e Compare January 9, 2025 14:24
@gmazoyer gmazoyer changed the title Address erroneous file import from git repo IFC-968 Address erroneous file import from git repo Jan 9, 2025
@gmazoyer gmazoyer marked this pull request as ready for review January 9, 2025 14:32
@gmazoyer gmazoyer changed the title IFC-968 Address erroneous file import from git repo IFC-968 Prevent importing git remote branch with conflicts Jan 9, 2025
@gmazoyer gmazoyer requested a review from a team January 9, 2025 15:02
Copy link
Contributor

@ajtmccarty ajtmccarty left a 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? 😢

@ogenstad
Copy link
Contributor

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?

@gmazoyer
Copy link
Contributor Author

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?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
group/backend Issue related to the backend (API Server, Git Agent)
Projects
None yet
3 participants