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

feat: 3 ways merge base on json merge patch #55

Merged
merged 2 commits into from
Jun 6, 2022
Merged

feat: 3 ways merge base on json merge patch #55

merged 2 commits into from
Jun 6, 2022

Conversation

howieyuen
Copy link
Collaborator

@howieyuen howieyuen commented May 31, 2022 •
edited by elliotxx

Purpose:

  • refactor kubernetes apply interface to client-side apply based on 3-way merge
  • fefactor ChangeStep structure to adopt 3-way diff if need

@coveralls
Copy link

coveralls commented May 31, 2022 •
edited

Pull Request Test Coverage Report for Build 2446096567

  • 18 of 20 (90.0%) changed or added relevant lines in 3 files are covered.
  • 3 unchanged lines in 1 file lost coverage.
  • Overall coverage decreased (-0.03%) to 77.11%
Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/engine/operation/resource_node.go 10 12 83.33%
Files with Coverage Reduction New Missed Lines %
pkg/engine/operation/parser.go 3 85.19%
Totals Coverage Status
Change from base Build 2409271143: -0.03%
Covered Lines: 3746
Relevant Lines: 4858
💛 - Coveralls

@howieyuen howieyuen force-pushed the 3-ways-merge branch 2 times, most recently from 9eb311a to 328ef78 Compare May 31, 2022 09:00
@howieyuen howieyuen requested a review from elliotxx as a code owner May 31, 2022 09:00
@howieyuen howieyuen changed the title [WIP]feat: 3 ways merge base on json merge patch feat: 3 ways merge base on json merge patch Jun 2, 2022
elliotxx
elliotxx previously approved these changes Jun 6, 2022
View reviewed changes
Copy link
Contributor

@elliotxx elliotxx left a comment

Choose a reason for hiding this comment

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

lgtm

elliotxx
elliotxx approved these changes Jun 6, 2022
View reviewed changes
Copy link
Contributor

@elliotxx elliotxx left a comment

Choose a reason for hiding this comment

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

lgtm

@elliotxx elliotxx merged commit d88c533 into main Jun 6, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Jun 6, 2022
@howieyuen howieyuen deleted the 3-ways-merge branch June 7, 2022 02:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@SparkYuan SparkYuan SparkYuan approved these changes

@elliotxx elliotxx elliotxx approved these changes

@markliby markliby Awaiting requested review from markliby

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@howieyuen @coveralls @SparkYuan @elliotxx