質問編集履歴
1
頂いた回答に対する検証を追記しました。
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -211,3 +211,53 @@
|
|
|
211
211
|
|
|
212
212
|
|
|
213
213
|
ディレクトリをイチから作り直し、同様の作業を行いましたが 実現できませんでした。
|
|
214
|
+
|
|
215
|
+
###補足(2020/10/10)
|
|
216
|
+
|
|
217
|
+
回答を頂いたので、試しにやってみました。その結果を書いておきます。
|
|
218
|
+
|
|
219
|
+
```Git
|
|
220
|
+
|
|
221
|
+
deploy % git pull heroku master
|
|
222
|
+
|
|
223
|
+
warning: no common commits
|
|
224
|
+
|
|
225
|
+
remote: Counting objects: 35, done.
|
|
226
|
+
|
|
227
|
+
remote: Compressing objects: 100% (35/35), done.
|
|
228
|
+
|
|
229
|
+
remote: Total 35 (delta 14), reused 0 (delta 0)
|
|
230
|
+
|
|
231
|
+
Unpacking objects: 100% (35/35), done.
|
|
232
|
+
|
|
233
|
+
From https://git.heroku.com/test-greeting
|
|
234
|
+
|
|
235
|
+
* branch master -> FETCH_HEAD
|
|
236
|
+
|
|
237
|
+
* [new branch] master -> heroku/master
|
|
238
|
+
|
|
239
|
+
fatal: refusing to merge unrelated histories
|
|
240
|
+
|
|
241
|
+
|
|
242
|
+
|
|
243
|
+
deploy % git push heroku master
|
|
244
|
+
|
|
245
|
+
To https://git.heroku.com/test-greeting.git
|
|
246
|
+
|
|
247
|
+
! [rejected] master -> master (non-fast-forward)
|
|
248
|
+
|
|
249
|
+
error: failed to push some refs to 'https://git.heroku.com/test-greeting.git'
|
|
250
|
+
|
|
251
|
+
hint: Updates were rejected because the tip of your current branch is behind
|
|
252
|
+
|
|
253
|
+
hint: its remote counterpart. Integrate the remote changes (e.g.
|
|
254
|
+
|
|
255
|
+
hint: 'git pull ...') before pushing again.
|
|
256
|
+
|
|
257
|
+
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
|
|
258
|
+
|
|
259
|
+
```
|
|
260
|
+
|
|
261
|
+
|
|
262
|
+
|
|
263
|
+
同様のエラーが出ました。
|