From 48d2de9446fdf31eb9a884121107a17caad4eae6 Mon Sep 17 00:00:00 2001 From: userno1 Date: Wed, 12 Oct 2022 15:21:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?= =?UTF-8?q?=E3=81=AEfork=E5=85=88=E3=81=A7=E3=81=AE=E5=88=9D=E3=82=81?= =?UTF-8?q?=E3=81=A6=E3=81=AE=E5=A4=89=E6=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- file1.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/file1.txt b/file1.txt index 70186bc..b6284f8 100644 --- a/file1.txt +++ b/file1.txt @@ -9,3 +9,8 @@ Forkのテスト。 オリジナルのコンテンツ追加。 改良改良。 +ローカル、つまりfork先で変更する。 +変更、変更。 + + + From 171064183b52cd7aa38df07e888bced6d400c335 Mon Sep 17 00:00:00 2001 From: userno1 Date: Wed, 12 Oct 2022 15:35:27 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?= =?UTF-8?q?=E3=81=AEfork=E5=85=88=E3=81=A7=E3=81=AE=E4=BA=8C=E5=9B=9E?= =?UTF-8?q?=E7=9B=AE=E3=81=AE=E5=A4=89=E6=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 3 +++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/original1.iml | 9 +++++++++ .idea/vcs.xml | 6 ++++++ file1.txt | 3 +++ 6 files changed, 35 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/original1.iml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..57cd710 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/original1.iml b/.idea/original1.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/original1.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/file1.txt b/file1.txt index b6284f8..c65fb6c 100644 --- a/file1.txt +++ b/file1.txt @@ -12,5 +12,8 @@ Forkのテスト。 ローカル、つまりfork先で変更する。 変更、変更。 +さらにローカルで変更。 +二回目。 +