Qiita Teams that are logged in
You are not logged in to any team

Log in to Qiita Team
Community
OrganizationEventAdvent CalendarQiitadon (β)
Service
Qiita JobsQiita ZineQiita Blog
0
Help us understand the problem. What are the problem?
@yukirisayu

gitでマージ出来ない

There isn’t anything to compare.とかerror: failed to push some refsとか出る。
私の場合、AWSで使っていたリポジトリから、herokuに移したくて、commitの履歴が違うよ~と言われていた模様。

これであっているか分からないけど出来た。

コンソール
git checkout hoge
git branch master hoge -f   
git checkout master
git push origin master -f

hogeは何かしらのブランチ名。

Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
0
Help us understand the problem. What are the problem?