diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..9aa6a64e3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+output.log
diff --git a/README.md b/README.md
index 9e7d03700..fefd5bd7d 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,5 @@
 # git-practice
-このリポジトリはGit動画講座用です．
+このリポジトリはGit動画講座用です.
+ローカルリポで変更  
+rebase-practiceで更新（rebase コンフリクト用）
+rebase pull用
diff --git a/another_file.txt b/another_file.txt
new file mode 100644
index 000000000..606cc5df2
--- /dev/null
+++ b/another_file.txt
@@ -0,0 +1 @@
+新しいファイルをmainブランチで作成
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..49ba5e4e8
--- /dev/null
+++ b/namechanged2.txt
@@ -0,0 +1 @@
+newfile作成
diff --git a/newfile.txt b/newfile.txt
new file mode 100644
index 000000000..529d21177
--- /dev/null
+++ b/newfile.txt
@@ -0,0 +1 @@
+created new file