D-S-Hub · ujiken512 · Feb 15, 2026 · Feb 15, 2026 · Feb 15, 2026 · Feb 15, 2026
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+output.log
+ignore_file.txt
diff --git a/README.md b/README.md
@@ -1,2 +1,6 @@
 # git-practice
 このリポジトリはGit動画講座用です．
+ローカルリポで変更 
+rebase-practiceブランチで更新(rebase コンフリクト用)
+rebase pull用
+stash練習(2nd変更)
diff --git a/another_file.txt b/another_file.txt
@@ -0,0 +1,2 @@
+新しいファイルをmainで作成
+pull時のrebase用コミット
diff --git a/delete_soon.txt b/delete_soon.txt
diff --git a/namechanged2.txt b/namechanged2.txt
@@ -0,0 +1 @@
+newfile作成
diff --git a/newfile.txt b/newfile.txt
@@ -0,0 +1 @@
+created new file!!
diff --git a/untrack.txt b/untrack.txt
@@ -0,0 +1 @@
+git stashでstashされません
diff --git a/urgent_file.txt b/urgent_file.txt
@@ -0,0 +1 @@
+緊急の作業
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		新しいファイルをmainで作成
		pull時のrebase用コミット