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

Better conflict resolution on merge #3242

Open
mortent opened this issue May 25, 2022 · 2 comments
Open

Better conflict resolution on merge #3242

mortent opened this issue May 25, 2022 · 2 comments
Labels
area/porch enhancement New feature or request p2 triaged Issue has been triaged by adding an `area/` label

Comments

@mortent
Copy link
Contributor

mortent commented May 25, 2022

During updates we might encounter merge conflicts. kpt currently only supports a single automated conflict resolution strategy (take upstream), which isn't the right one in all cases. We should support different strategies, including letting the user resolve conflicts manually.
@mortent mortent added enhancement New feature or request p2 triaged Issue has been triaged by adding an `area/` label area/porch labels May 25, 2022
@bgrant0607
Copy link
Contributor

See also #3121 for a discussion of desired merge behavior.

@bgrant0607
Copy link
Contributor

More descriptions of desired merge behavior:
#3329 (comment)

@bgrant0607 bgrant0607 mentioned this issue Jul 28, 2022
Open
@liamfallon liamfallon mentioned this issue Apr 23, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
area/porch enhancement New feature or request p2 triaged Issue has been triaged by adding an `area/` label
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@mortent @bgrant0607