Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
BY COMPANY SIZE
Enterprises
Small and medium teams
Startups
Nonprofits
BY USE CASE
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
BY INDUSTRY
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
EXPLORE BY TOPIC
AI
Software Development
DevOps
Security
View all topics
EXPLORE BY TYPE
Customer stories
Events & webinars
Ebooks & reports
Business insights
GitHub Skills
SUPPORT & SERVICES
Documentation
Customer support
Community forum
Trust center
Partners
View all resources
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search
/
Sign in
Sign up
Appearance settings
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
databus23
/
helm-diff
Public
Notifications
You must be signed in to change notification settings
Fork
328
Star
3.5k
Code
Issues
44
Pull requests
4
Actions
Projects
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Security and quality
Insights
fix: detect manual changes on CRDs and CRs with three-way-merge
- #923
#923
Merged
yxxhero
merged 14 commits into
master
databus23/helm-diff:master
from
fix/cr-three-way-merge
databus23/helm-diff:fix/cr-three-way-merge
Copy head branch name to clipboard
Sep 25, 2026
Conversation
Commits
14
(14)
Checks
Files changed
Merged
fix: detect manual changes on CRDs and CRs with three-way-merge
#923
yxxhero
merged 14 commits into
master
databus23/helm-diff:master
from
fix/cr-three-way-merge
databus23/helm-diff:fix/cr-three-way-merge
Copy head branch name to clipboard
Commits
Commits on Feb 1, 2026
fix: detect manual changes on CRDs and CRs with three-way-merge
Show description for 115630c
yxxhero
committed
115630c
View commit details
Copy full SHA for 115630c
Browse repository at this point
test: add tests for three-way merge with unstructured objects
Show description for 6610be9
yxxhero
committed
6610be9
View commit details
Copy full SHA for 6610be9
Browse repository at this point
fix: properly detect drift when chart unchanged for unstructured objects
Show description for a460e71
yxxhero
committed
a460e71
View commit details
Copy full SHA for a460e71
Browse repository at this point
fix: correct comment direction in three-way merge logic
Show description for efb7e0a
yxxhero
committed
efb7e0a
View commit details
Copy full SHA for efb7e0a
Browse repository at this point
Commits on Feb 14, 2026
fix: clean metadata fields to avoid resourceVersion patch errors
Show description for a59ce03
yxxhero
committed
a59ce03
View commit details
Copy full SHA for a59ce03
Browse repository at this point
fix: preserve live-only fields in three-way merge for unstructured objects
Show description for 5d14d97
yxxhero
committed
5d14d97
View commit details
Copy full SHA for 5d14d97
Browse repository at this point
refactor: reuse deleteStatusAndTidyMetadata in cleanMetadataForPatch
Show description for f5b13c2
yxxhero
committed
f5b13c2
View commit details
Copy full SHA for f5b13c2
Browse repository at this point
Commits on Feb 15, 2026
fix: handle null input in deleteStatusAndTidyMetadata
Show description for 2ff4b31
yxxhero
committed
2ff4b31
View commit details
Copy full SHA for 2ff4b31
Browse repository at this point
fix: improve error handling and type safety
Show description for 1076d7d
yxxhero
committed
1076d7d
View commit details
Copy full SHA for 1076d7d
Browse repository at this point
Commits on Sep 25, 2026
Merge origin/master into fix/cr-three-way-merge
Show description for 3c2830c
yxxhero
committed
3c2830c
View commit details
Copy full SHA for 3c2830c
Browse repository at this point
test: add e2e regression test for CR/CRD drift detection (#917)
Show description for 548fcc6
yxxhero
committed
548fcc6
View commit details
Copy full SHA for 548fcc6
Browse repository at this point
fix(test): pre-install the CRD before helm install in #917 e2e test
Show description for a0a4264
yxxhero
committed
a0a4264
View commit details
Copy full SHA for a0a4264
Browse repository at this point
fix(test): adopt the pre-installed CRD into the release in #917 e2e test
Show description for 06fc4a1
yxxhero
committed
06fc4a1
View commit details
Copy full SHA for 06fc4a1
Browse repository at this point
fix(test): drift a names field instead of served in #917 CRD scenario
Show description for bafc142
yxxhero
committed
bafc142
View commit details
Copy full SHA for bafc142
Browse repository at this point
You can’t perform that action at this time.