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

Feat: add three way merge patch #8

Merged
merged 1 commit into from
Sep 19, 2022
Merged

Conversation

FogDong
Copy link
Member

@FogDong FogDong commented Sep 19, 2022

Signed-off-by: FogDong dongtianxin.tx@alibaba-inc.com

@codecov
Copy link

codecov bot commented Sep 19, 2022

Codecov Report

Base: 91.47% // Head: 90.30% // Decreases project coverage by -1.16% ⚠️

Coverage data is based on head (af083cb) compared to base (3b2c88e).
Patch coverage: 86.30% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main       #8      +/-   ##
==========================================
- Coverage   91.47%   90.30%   -1.17%     
==========================================
  Files          14       14              
  Lines         258      330      +72     
==========================================
+ Hits          236      298      +62     
- Misses         14       19       +5     
- Partials        8       13       +5     
Flag Coverage Δ
unit-test 90.30% <86.30%> (-1.17%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
util/k8s/patch/patch.go 80.76% <80.76%> (ø)
util/k8s/object.go 94.11% <100.00%> (+9.50%) ⬆️
multicluster/utils.go

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
@Somefive Somefive merged commit d9d2daa into kubevela:main Sep 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants