Skip to content
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.

Sign up for GitHub

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

Conflict remote #1270

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Conflict remote #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d1d2ded
add newfile
yuuichi8314 Oct 10, 2024
79c9c13
change name
yuuichi8314 Oct 11, 2024
d333a1a
change name again
yuuichi8314 Oct 11, 2024
6c02321
make new file
yuuichi8314 Oct 12, 2024
273ade8
delete file
yuuichi8314 Oct 12, 2024
50e4ff5
new file
yuuichi8314 Oct 12, 2024
3087d75
add gitigonre
yuuichi8314 Oct 12, 2024
d7dfba3
update readme
yuuichi8314 Oct 13, 2024
279e8a0
update readme for automatic merge
yuuichi8314 Oct 13, 2024
bbaa7a1
make new file forautomaticmerge
yuuichi8314 Oct 13, 2024
fca744f
Merge branch 'no-fast-forward'
yuuichi8314 Oct 13, 2024
f5abed5
update readme on conflict branch for conflict
yuuichi8314 Oct 13, 2024
cb47218
update readme on main for conflict
yuuichi8314 Oct 13, 2024
9f141f6
resolve conflict
yuuichi8314 Oct 13, 2024
d4f2092
Update README.md
yuuichi8314 Oct 15, 2024
8ac92df
update readme on conflict for conflict
yuuichi8314 Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
output.log
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# git-practice
このリポジトリはGit動画講座用です．
ローカルリポで変更
conflict-remote上で更新（コンフリクト発生）
Empty file added delete_soon.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions namechanged2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
newfile作成
1 change: 1 addition & 0 deletions newfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
created new file!