D-S-Hub · oyaniwakani · May 18, 2025 · May 18, 2025 · May 18, 2025 · May 19, 2025
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,4 @@
 # git-practice
 このリポジトリはGit動画講座用です．
+rebase-branchで編集(conflict 発生)
+stash practice(2nd stash)
diff --git a/anotherfile.txt b/anotherfile.txt
@@ -0,0 +1,2 @@
+create new file on xx branch.
+pull時のrebase用
diff --git a/index.html b/index.html
@@ -0,0 +1,9 @@
+<html lang="ja">
+    <head>
+	    <title>hello world</title>
+    </head>
+    <body>
+        <h1>hello world</h1>
+    </body>
+</html>
+
diff --git a/newfile.txt b/newfile.txt
diff --git a/untrack.txt b/untrack.txt
@@ -0,0 +1 @@
+untrack確認→stashでstashされない
diff --git a/urgent_file.txt b/urgent_file.txt
@@ -0,0 +1 @@
+urgent work!!
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		create new file on xx branch.
		pull時のrebase用