Nephio is a Kubernetes-based automation platform for deploying and managing highly distributed, interconnected workloads such as 5G Network Functions, and the underlying infrastructure on which those workloads depend.
Original issue URL: https://github.com/kptdev/kpt/issues/3242
Original issue user: https://github.com/mortent
Original issue created at: 2022-05-25T15:02:37Z
Original issue last updated at: 2022-07-01T23:15:27Z
Original issue body: 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.
Original issue comments:
Comment user: https://github.com/bgrant0607
Comment created at: 2022-06-07T19:51:20Z
Comment last updated at: 2022-06-07T19:51:20Z
Comment body: See also #3121 for a discussion of desired merge behavior.
Original issue URL: https://github.com/kptdev/kpt/issues/3242 Original issue user: https://github.com/mortent Original issue created at: 2022-05-25T15:02:37Z Original issue last updated at: 2022-07-01T23:15:27Z Original issue body: 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.
Original issue comments: Comment user: https://github.com/bgrant0607 Comment created at: 2022-06-07T19:51:20Z Comment last updated at: 2022-06-07T19:51:20Z Comment body: See also #3121 for a discussion of desired merge behavior.
Comment user: https://github.com/bgrant0607 Comment created at: 2022-07-01T23:15:27Z Comment last updated at: 2022-07-01T23:15:27Z Comment body: More descriptions of desired merge behavior: https://github.com/GoogleContainerTools/kpt/issues/3329#issuecomment-1171413221