diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..723ef36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/README.md b/README.md
index d6414c0..caedb31 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,15 @@
 # phpstudy
 php学习
+
+
+测试一下git
+
+
+当前分支被合并到其他分支后, 当前分支回滚, 在合并到其他分支, 其他分支是否产生变化.
+
+
+
+继续加一下东西
+
+
+这里是要被回滚的
\ No newline at end of file
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..f96f340
--- /dev/null
+++ b/index.php
@@ -0,0 +1,7 @@
+<?php
+echo "hello, hello!";
+
+echo "这里是要被回滚的";
+
+
+echo "离谱";
\ No newline at end of file