diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8f02e89
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+test/
+node_modules/
diff --git a/test.md b/test.md
new file mode 100644
index 0000000..1f7815c
--- /dev/null
+++ b/test.md
@@ -0,0 +1,9 @@
+# 测试git
+
+- 新增更新，测试合并
+- 合并代码使用 merge --no-ff
+- 测试代码撤销
+- 继续测试代码撤销
+- 继续测试
+- 测试撤销2
+- test Sourcetree