diff options
| -rw-r--r-- | doPublish.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doPublish.go b/doPublish.go index 74cccc8..5abae0d 100644 --- a/doPublish.go +++ b/doPublish.go @@ -36,7 +36,11 @@ func doPublish() error { me.sh.BadExit("merge failed", nil) } - cmd = []string{"forge", "merge", "check"} + if argv.Force { + cmd = []string{"forge", "--force", "merge", "check"} + } else { + cmd = []string{"forge", "merge", "check"} + } if _, err := shell.RunRealtimeError(cmd); err != nil { if _, err := shell.RunVerbose(cmd); err != nil { me.sh.BadExit("merge failed", nil) |