git
差分
この文書の現在のバージョンと選択したバージョンの差分を表示します。
| 両方とも前のリビジョン 前のリビジョン 次のリビジョン | 前のリビジョン | ||
|
git [2019/01/10 23:21] ips [リモートを追加する] |
— (現在) | ||
|---|---|---|---|
| ライン 1: | ライン 1: | ||
| - | ====== git ====== | ||
| - | |||
| - | |||
| - | |||
| - | ==== アップするとエラーとなる場合の対応 ==== | ||
| - | |||
| - | 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> | ||
git.1547130111.txt.gz · 最終更新: 2019/01/10 23:21 by ips
