diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..05a60b8
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..b3d52f2
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
\ 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/GitTest/src/Main.java b/GitTest/src/Main.java
index 14b4345..779a331 100644
--- a/GitTest/src/Main.java
+++ b/GitTest/src/Main.java
@@ -1,11 +1,12 @@
-
-public class Main {
-
- public static void main(String[] args) {
- System.out.println("branch1�ŕ��ʂɕύX");
- System.out.println("branch2 ��branch1�Ƌ�������C�����s��");
- System.out.println("master���ŋ������������ꂽ�̂������܂�branch2�ł��X�ɕύX");
- System.out.println("master���ŋ������������ꂽ�̂������܂�branch1�ōX�ɕύX");
- }
-
-}
+
+public class Main {
+
+ public static void main(String[] args) {
+ System.out.println("branch1で普通に変更");
+ System.out.println("branch2 でbranch1と競合する修正を行う");
+ System.out.println("master側で競合が解消されたのを無視したままbranch2でも更に変更");
+ System.out.println("master側で競合が解消されたのを無視したままbranch1で更に変更");
+ System.out.println("岩谷 草紀");
+ }
+
+}