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

Sane merge behavior for non-KRM files #3418

Open
bgrant0607 opened this issue Jul 28, 2022 · 1 comment
Open

Sane merge behavior for non-KRM files #3418

bgrant0607 opened this issue Jul 28, 2022 · 1 comment
Labels
area/pkg enhancement New feature or request triaged Issue has been triaged by adding an `area/` label
Projects
kpt kanban board

Comments

@bgrant0607
Copy link
Contributor

bgrant0607 commented Jul 28, 2022 •
edited
Loading

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.
@bgrant0607 bgrant0607 added the enhancement New feature or request label Jul 28, 2022
@yuwenma yuwenma mentioned this issue Jul 29, 2022
Draft
@yuwenma
Copy link
Contributor

yuwenma commented Aug 26, 2022

Some updates: we did POC about same-merge behavior of non-KRM files
Demo1: drive.google.com/file/d/1BMYH3HcTzUcnSTk0iO0oO_O4O_RiUhF7/view
The graph below explains the high level workflow, more context can be found in the CUJ and strawman doc

Screen Shot 2022-08-26 at 14 52 10

@mortent mortent added area/pkg triaged Issue has been triaged by adding an `area/` label area/pkg-update labels Nov 16, 2022
@mortent mortent added this to ToDo in kpt kanban board Nov 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
area/pkg enhancement New feature or request triaged Issue has been triaged by adding an `area/` label
Projects
kpt kanban board
ToDo
Milestone
No milestone
Development

No branches or pull requests
3 participants
@mortent @yuwenma @bgrant0607