Sane merge behavior for non-KRM files #3418
Labels
area/pkg
enhancement
New feature or request
triaged
Issue has been triaged by adding an `area/` label
Related to #2350, #3118, #3119, #3210, #3242, #3329, and other merge/update-related issues.
We expect non-KRM files in packages. We need to merge those at least as well as git does.
The text was updated successfully, but these errors were encountered: