diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..12e80045f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+output.log
+ignore_file.txt
\ No newline at end of file
diff --git a/README.md b/README.md
index 9e7d03700..10cdd8f18 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,10 @@
 # git-practice
 このリポジトリはGit動画講座用です．
+Gitを変更しました！
+conflict branch changed コンフリクト発生！
+conflict-local 上で更新しました
+rebase-practiceブランチで更新しました！！　コンフリクト用
+rebase用
+stash conflict 用
+shatsh　トラッkす
+second
\ No newline at end of file
diff --git a/another_file.txt b/another_file.txt
new file mode 100644
index 000000000..ca0bf7400
--- /dev/null
+++ b/another_file.txt
@@ -0,0 +1,2 @@
+新しいファイルをmainブランチで作成
+pull時のrebas用
\ No newline at end of file
diff --git a/delete_soon.txt b/delete_soon.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/igunore_file.txt b/igunore_file.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/namechanged2.txt b/namechanged2.txt
new file mode 100644
index 000000000..2f0b87a1f
--- /dev/null
+++ b/namechanged2.txt
@@ -0,0 +1 @@
+newfile 作成!
diff --git a/newfile.txt b/newfile.txt
new file mode 100644
index 000000000..cea55e870
--- /dev/null
+++ b/newfile.txt
@@ -0,0 +1 @@
+created new file
\ No newline at end of file
diff --git a/untrack.txt b/untrack.txt
new file mode 100644
index 000000000..8b8a4df5f
--- /dev/null
+++ b/untrack.txt
@@ -0,0 +1 @@
+git stash でstashされません
\ No newline at end of file
diff --git a/urgent_file.txt b/urgent_file.txt
new file mode 100644
index 000000000..4d10f55ff
--- /dev/null
+++ b/urgent_file.txt
@@ -0,0 +1 @@
+緊急の作業
\ No newline at end of file