D-S-Hub · monacomoo · May 29, 2025 · May 31, 2025 · May 31, 2025 · May 31, 2025
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+output.log
diff --git 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
@@ -0,0 +1 @@
+新しいファイルをmainブランチで作成
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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		新しいファイルをmainブランチで作成