Better conflict resolution on merge

Open mortent opened this issue 3 years ago • 2 comments

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.

May 25 '22 15:05 mortent

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

Jun 07 '22 19:06 bgrant0607

More descriptions of desired merge behavior: https://github.com/GoogleContainerTools/kpt/issues/3329#issuecomment-1171413221

Jul 01 '22 23:07 bgrant0607