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..83c750c11 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
-# git-practice
+it-practice
 このリポジトリはGit動画講座用です．
+ローカルリポで変更
+mainブランチで更新（rebase コンフリクト用）
+rebase pull用
+stash練習（2st）
diff --git a/another_file.txt b/another_file.txt
new file mode 100644
index 000000000..1d68e3398
--- /dev/null
+++ b/another_file.txt
@@ -0,0 +1,2 @@
+新しいファイルをmainで作成
+pull時のrebase用コミット
\ 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/namechanged2.txt b/namechanged2.txt
new file mode 100644
index 000000000..99c7b7d92
--- /dev/null
+++ b/namechanged2.txt
@@ -0,0 +1 @@
+newfile作成
\ No newline at end of file
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..9d2103e10
--- /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