Hameer Abbasi
Hameer Abbasi

Reputation: 1314

Why do my GitHub pull requests need to be rebased after each commit to master?

I'm having an issue where GitHub doesn't automatically rebase/merge my pull requests at all, even if commits to master since the PR branch was created don't even touch the same files the PR itself touches, so there aren't any merge conflicts at all.

I know this is possible in GitHub, I've encountered a few repositories myself where PRs don't require a rebase and merge conflicts are automatically resolved.

The repository in question is here.

I've tried going through the project settings but I cannot seem to find a setting that says that this is an issue. Also, if I rebase my PRs manually, it usually happens automatically without me being prompted to resolve any conflics.

Upvotes: 1

Views: 2069

Answers (1)

Chris
Chris

Reputation: 136918

This is configured in the required status checks section, found in SettingsBranchesProtected Branches. The relevant setting is "Require branches to be up to date before merging".

If this feature is enabled, and status checking is set to "strict" (it is by default), then

you'll need to bring the head branch up to date after other collaborators merge pull requests to the protected base branch.

Upvotes: 2

Related Questions