diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..b055d80ab
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+output.log
+ignore_file.txt
diff --git a/README.md b/README.md
index 9e7d03700..9304b9dcd 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
# git-practice
このリポジトリはGit動画講座用です．
+rebase-branchで編集(conflict 発生)
+stash practice(2nd stash)
diff --git a/anotherfile.txt b/anotherfile.txt
new file mode 100644
index 000000000..9b66c3fa7
--- /dev/null
+++ b/anotherfile.txt
@@ -0,0 +1,2 @@
+create new file on xx branch.
+pull時のrebase用
diff --git a/index.html b/index.html
new file mode 100644
index 000000000..ac32dfb73
--- /dev/null
+++ b/index.html
@@ -0,0 +1,9 @@
+
+
+ hello world
+
+
+ hello world
+
+
+
diff --git a/newfile.txt b/newfile.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/untrack.txt b/untrack.txt
new file mode 100644
index 000000000..831773312
--- /dev/null
+++ b/untrack.txt
@@ -0,0 +1 @@
+untrack確認→stashでstashされない
diff --git a/urgent_file.txt b/urgent_file.txt
new file mode 100644
index 000000000..b13606c3f
--- /dev/null
+++ b/urgent_file.txt
@@ -0,0 +1 @@
+urgent work!!