0
0

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.

BitBucketにPushできなかった時の解決策(備忘録)

Posted at

BitBucketにPushをしようとしたらrejectされた。

起こったこと

  ソースファイルをBitBucketのリポジトリにPushしようとしたが、![rejected]された。(Githubで試したが問題なくPushできた。)

$git push origin master

error: failed to push some refs to 'https://bitbucket.org/×××/○○○.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

解決法

エラーメッセージの中に

hint: 'git pull ...') before pushing again.

とあったので、まずはgit pull してみようと思ったのだが…

$git pull origin master

From https://bitbucket.org/×××/○○○
 * branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

無関係のブランチはマージできないらしい。
そこで、

git pull --allow-unrelated-histories origin master

として、オプションで無関係のブランチのマージを許可すると、問題なくpullできた。
その後、当初の目的であるgit pushも成功した。

0
0
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
0
0

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?