Conflict remote #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

teaMitea wants to merge 22 commits into D-S-Hub:main from teaMitea:conflict-remote

.gitignore

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		output.log

README.md

-Original file line number
+Diff line change
@@ -1,2 +1,8 @@
-    # git-practice
+    git-practice
     このリポジトリはGit動画講座用です．
+    ローカルリポで変更
+    conflictでブランチで変更
+    conflict-remote上で更新コンフリクト発生

delete_soon.txt

Empty file.

namechanged2.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		newfile作成

newfile.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		mainで作成

Provide feedback