Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable the rebase error for if there are merge commits in the PR commit history #210

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable the rebase error for if there are merge commits in the PR commit history #210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Dangerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ warn "PR is classed as Work in Progress" if github.pr_title.include? "[WIP]"
warn "Big PR, consider splitting into smaller" if git.lines_of_code > 500

# Ensure a clean commits history
if git.commits.any? { |c| c.message =~ /^Merge branch '#{github.branch_for_base}'/ }
fail "Please rebase to get rid of the merge commits in this PR"
end
#if git.commits.any? { |c| c.message =~ /^Merge branch '#{github.branch_for_base}'/ }
# fail "Please rebase to get rid of the merge commits in this PR"
#end
# Disabled because currently we use squish and rebase instead of carrying over the commit history. This doesn't matter for the main repo.

# Mainly to encourage writing up some reasoning about the PR, rather than
# just leaving a title
Expand Down