From 785c460f557dc467bafc3c46f86a28e6117e0f0e Mon Sep 17 00:00:00 2001
From: LI HAIXIN <lihaixin000@gmail.com>
Date: Wed, 21 Aug 2024 15:50:12 +0800
Subject: [PATCH 1/3] init

---
 .idea/.gitignore            | 3 +++
 .idea/misc.xml              | 6 ++++++
 .idea/modules.xml           | 8 ++++++++
 .idea/samplerepo-things.iml | 9 +++++++++
 .idea/vcs.xml               | 6 ++++++
 5 files changed, 32 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/samplerepo-things.iml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /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 00000000..862d09bd
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="20" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..83e6f252
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/samplerepo-things.iml" filepath="$PROJECT_DIR$/.idea/samplerepo-things.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/samplerepo-things.iml b/.idea/samplerepo-things.iml
new file mode 100644
index 00000000..d6ebd480
--- /dev/null
+++ b/.idea/samplerepo-things.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From ee02f3a140b8057005cfa040e6bc066f1f51d5be Mon Sep 17 00:00:00 2001
From: LI HAIXIN <lihaixin000@gmail.com>
Date: Wed, 21 Aug 2024 15:55:00 +0800
Subject: [PATCH 2/3] added watermelon

---
 fruits.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fruits.txt b/fruits.txt
index 17f45281..f8f1c48f 100644
--- a/fruits.txt
+++ b/fruits.txt
@@ -1,3 +1,5 @@
 apples
 berries
 cherries
+watermelon
+

From bd26de0df6c130e37844e9a74f679e1de3d76871 Mon Sep 17 00:00:00 2001
From: LI HAIXIN <lihaixin000@gmail.com>
Date: Tue, 10 Sep 2024 20:41:49 +0800
Subject: [PATCH 3/3] Add feature1 changes

---
 colors.txt | 2 ++
 fruits.txt | 4 ++--
 shapes.txt | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/colors.txt b/colors.txt
index caf8a36f..9c42d0b9 100644
--- a/colors.txt
+++ b/colors.txt
@@ -1,3 +1,5 @@
 blue
 red
 white
+green
+yellow
diff --git a/fruits.txt b/fruits.txt
index f8f1c48f..56ff08cf 100644
--- a/fruits.txt
+++ b/fruits.txt
@@ -1,5 +1,5 @@
 apples
 berries
 cherries
-watermelon
-
+watermelons
+oranges
diff --git a/shapes.txt b/shapes.txt
index 2b50ee02..ea3b8f30 100644
--- a/shapes.txt
+++ b/shapes.txt
@@ -2,3 +2,5 @@ circle
 oval
 rectangle
 square
+trapezium
+