Dangerfile: improve message about branch rebasing.

php-coder · php-coder · commit 4f877a6f724e · 2017-03-22T22:30:09.000+01:00
Should be in 9dfd381 commit. Addressed to #537 No functional changes. [ci skip]
diff --git a/Dangerfile b/Dangerfile
@@ -673,7 +673,7 @@ if commits > 1
 	if git.commits.any? { |c| c.message =~ /^Merge branch/ || c.message =~ /^Merge remote-tracking branch/ }
 		fail(
 			"danger check: pull request contains merge commits! "\
-			"Please, rebase your branch to get rid of them:\n"\
+			"Please, rebase your branch to get rid of them: "\
 			"`git rebase master #{github.branch_for_head}`"
 		)
 	else

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ if commits > 1`
`673`	`673`	`if git.commits.any? { \|c\| c.message =~ /^Merge branch/ \|\| c.message =~ /^Merge remote-tracking branch/ }`
`674`	`674`	`fail(`
`675`	`675`	`"danger check: pull request contains merge commits! "\`
`676`		`- "Please, rebase your branch to get rid of them:\n"\`
	`676`	`+ "Please, rebase your branch to get rid of them: "\`
`677`	`677`	"`git rebase master #{github.branch_for_head}`"
`678`	`678`	`)`
`679`	`679`	`else`