質問編集履歴
1
ログ記入
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
```
|
|
1
|
+
```GIT
|
|
2
2
|
|
|
3
3
|
git pull
|
|
4
4
|
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
と
|
|
8
8
|
|
|
9
|
-
```
|
|
9
|
+
```GIT
|
|
10
10
|
|
|
11
11
|
git fetch origin master
|
|
12
12
|
|
|
@@ -15,3 +15,57 @@
|
|
|
15
15
|
```
|
|
16
16
|
|
|
17
17
|
は等しいという記述を目にしましたが、リモートに新たな更新があって、ローカルに適用しようとした際に、前者なら正常に更新が反映されるのですが、後者は「**alredy up to date**」と出ます。この二つの違いは何でしょうか？
|
|
18
|
+
|
|
19
|
+
--------------------------------
|
|
20
|
+
|
|
21
|
+
**詳細なログ**
|
|
22
|
+
|
|
23
|
+
```GIT
|
|
24
|
+
|
|
25
|
+
>>> git fetch origin master
|
|
26
|
+
|
|
27
|
+
Username for 'https://github.com': user_name
|
|
28
|
+
|
|
29
|
+
Password for 'https://user_name@github.com':
|
|
30
|
+
|
|
31
|
+
remote: Enumerating objects: 12, done.
|
|
32
|
+
|
|
33
|
+
remote: Counting objects: 100% (12/12), done.
|
|
34
|
+
|
|
35
|
+
remote: Compressing objects: 100% (2/2), done.
|
|
36
|
+
|
|
37
|
+
remote: Total 7 (delta 4), reused 7 (delta 4), pack-reused 0
|
|
38
|
+
|
|
39
|
+
Unpacking objects: 100% (7/7), done.
|
|
40
|
+
|
|
41
|
+
From https://github.com/project_name
|
|
42
|
+
|
|
43
|
+
* branch master -> FETCH_HEAD
|
|
44
|
+
|
|
45
|
+
>>> git merge origin/master
|
|
46
|
+
|
|
47
|
+
Already up-to-date
|
|
48
|
+
|
|
49
|
+
>>> git pull
|
|
50
|
+
|
|
51
|
+
Username for 'https://github.com': user_name
|
|
52
|
+
|
|
53
|
+
Password for 'https://user_name@github.com':
|
|
54
|
+
|
|
55
|
+
From https://github.com/project_name
|
|
56
|
+
|
|
57
|
+
4c8c505..0946b9c master -> origin/master
|
|
58
|
+
|
|
59
|
+
Updating 4c8c505..0946b9c
|
|
60
|
+
|
|
61
|
+
Fast-forward
|
|
62
|
+
|
|
63
|
+
myapp/migrations/0028_auto_20181121_1613.py | 83 +
|
|
64
|
+
|
|
65
|
+
myapp/models.py | 29 +-
|
|
66
|
+
|
|
67
|
+
static/myapp/css/base.css | 50 -
|
|
68
|
+
|
|
69
|
+
以下略
|
|
70
|
+
|
|
71
|
+
```
|