force-conflict

internal/run/upgrade.go

@@ -21,6 +21,7 @@ type Upgrade struct {
 	reuseValues     bool
 	timeout         string
 	force           bool
+	forceConflict   bool
 	atomic          bool
 	cleanupOnFail   bool
 	historyMax      int
@@ -90,6 +91,9 @@ func (u *Upgrade) Prepare() error {
 	if u.force {
 		args = append(args, "--force-replace")
 	}
+	if u.forceConflict {
+		args = append(args, "--force-conflicts")
+	}
 	if u.atomic {
 		args = append(args, "--atomic")
 	}