default merge method

ofpiyush · Feb 26, 2018 · d7f1b40 · d7f1b40
1 parent dad9483
commit d7f1b40
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/automerger/config.go b/automerger/config.go
@@ -43,7 +43,7 @@ func ConfigureOrDie() *Config {
 	flag.StringVar(&config.Address, "address", "0.0.0.0:3000", "Address to listen on.")
 	flag.StringVar(&config.Branch, "branch", "master", "Branch to start PRs from.")
 	flag.StringVar(&config.ApiURL, "api-url", "https://api.github.com", "URL of github installation.")
-	flag.StringVar(&config.MergeMethod, "merge-method", "squash", "How to merge changes on default branch to current branch.")
+	flag.StringVar(&config.MergeMethod, "merge-method", "merge", "How to merge changes on default branch to current branch.")
 	flag.Var(&config.Assignees, "assignee", "Assignees if PR merge fails\nDefaults to the pusher.")
 
 	flag.Parse()