special handling for IP relationships in diff and merge #5076
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
group/backend
CodSpeed Performance ReportMerging #5076 will not alter performanceComparing Summary
|
ajtmccarty
force-pushed
the
ajtm-11272024-managed-ip-rels
branch
from
6c18630
to
1e992af
Compare
ajtmccarty
force-pushed
the
ajtm-11272024-managed-ip-rels
branch
from
0e39cfa
to
8b745aa
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IFC-986
we need some special handling in the diff and merge logic for certain IPAM relationships that we manage for the user. we should not allow conflicts on these managed relationships and we should not include them when merging b/c they are going to get updated by the IPAM reconcile logic after the merge completes anyway.
This is not ready for primetime yet. it definitely needs more unit tests and I need to review it all again