猫型iPS細胞研究所

この文書は読取専用です。文書のソースを閲覧することは可能ですが、変更はできません。もし変更したい場合は管理者に連絡してください。

==== pushのエラー ====

git push -u origin master でエラー
<code>
C:\Users\xxx\react\expo-swipe-delete>git push -u origin master
To https://github.com/nekotype/expo-swipe-delete.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://github.com/nekotype/expo-swipe-delete.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
</code>
　↓
手順１）git fetch && git merge origin/master
<code>
C:\Users\xxx\react\expo-swipe-delete>git fetch && git merge origin/master
warning: no common commits
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (5/5), done.
From https://github.com/nekotype/expo-swipe-delete
 * [new branch]      master     -> origin/master
fatal: refusing to merge unrelated histories
</code>
　↓
手順２）git merge --allow-unrelated-histories origin/master
<code>
C:\Users\xxx\react\expo-swipe-delete>git merge --allow-unrelated-histories origin/master
Already up to date!
Merge made by the 'recursive' strategy.
</code>
　↓
手順３）git push -u origin master　プッシュできた！
<code>
C:\Users\xxx\react\expo-swipe-delete>git push -u origin master
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 12 threads.
Compressing objects: 100% (14/14), done.
Writing objects: 100% (15/15), 71.31 KiB | 7.92 MiB/s, done.
Total 15 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), done.
To https://github.com/nekotype/expo-swipe-delete.git
   e36aaf7..7149796  master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.
</code>

猫型iPS細胞研究所

ユーザ用ツール

サイト用ツール

ページ用ツール