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.

Sign up for GitHub

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

Jump to bottom

switch to use new diff logic for merge #4594

Merged
merged 14 commits into from
Oct 16, 2024
Merged

switch to use new diff logic for merge #4594

merged 14 commits into from
Oct 16, 2024

Conversation

ajtmccarty
Copy link
Contributor

@ajtmccarty ajtmccarty commented Oct 10, 2024 •
edited
Loading

  • makes the switch to use merge logic based on the new diff
  • can be reverted if it breaks things
  • will need a follow-up PR to remove dead code and clean up how the DiffMerger is instantiated and called... and maybe clean up some circular dependencies that prevented me from using SchemaBranch inside of DiffMergeSerializer
  • fixes some other bugs in diff calculation that were identified by tests that use the merge

@github-actions github-actions bot added the group/backend Issue related to the backend (API Server, Git Agent) label Oct 10, 2024
Base automatically changed from ajtm-10092024-diff-merge-props-IFC-675 to develop October 14, 2024 21:41
@ajtmccarty ajtmccarty marked this pull request as ready for review October 16, 2024 06:24
@ajtmccarty ajtmccarty requested a review from a team October 16, 2024 06:25
@dgarros dgarros merged commit b695018 into develop Oct 16, 2024
31 checks passed
@dgarros dgarros deleted the ajtm-10092024-diff-switch branch October 16, 2024 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgarros dgarros dgarros approved these changes

Assignees
No one assigned
Labels
group/backend Issue related to the backend (API Server, Git Agent)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ajtmccarty @dgarros