21
17

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?

More than 1 year has passed since last update.

githubでpull requestが「This branch is out-of-date with the base branch」になってマージ出来ない場合の対処法

Last updated at Posted at 2016-04-07

問題

Github上のPull Requestが「This branch is out-of-date with the base branch」となってマージ出来なくなる場合がある。

スクリーンショット 2016-04-07 15.49.41.png

原因

スクリーンショット 2016-04-07 15.50.11.png

上記の「Require branches to be up to date before merging」にチェックが入っていると、コンフリクトが発生していなくても、ブランチがベースブランチ上の最新のコードでテストされてないとマージ出来なくなる。

解決策

「Require branches to be up to date before merging」のチェックを外せば、マージ出来るようになる。

スクリーンショット 2016-04-07 16.02.58.png

参考

Enabling required status checks

Optionally, deselect Require branches to be up-to-date before merging. If selected, this ensures that the branch is tested with the latest code on the base branch.

21
17
0

Register as a new user and use Qiita more conveniently

  1. You get articles that match your needs
  2. You can efficiently read back useful information
  3. You can use dark theme
What you can do with signing up
21
17

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?