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

New feature #1285

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

New feature #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
54ce4d8
newfil.txt
madochannel Oct 27, 2024
0b5a687
change name
madochannel Nov 3, 2024
a7d1506
change name again
madochannel Nov 3, 2024
10bb2c3
make new file
madochannel Nov 4, 2024
f1c5f91
delete new file
madochannel Nov 4, 2024
4f2f701
new file
madochannel Nov 4, 2024
006b7fd
add gitignore
madochannel Nov 8, 2024
a5e7ce5
update README
madochannel Nov 17, 2024
16c2777
update readme for automatic merge
madochannel Nov 17, 2024
74c5a4d
make new file for automatic merge
madochannel Nov 17, 2024
e741890
Merge branch 'no-fast-forward' into main
madochannel Nov 17, 2024
eb877a0
update readme on conflict branch for conflict
madochannel Nov 18, 2024
1e74a40
uptade readme on main for conflict
madochannel Nov 18, 2024
b3eb563
resolve conflict
madochannel Nov 18, 2024
b847480
Update README.md on Github
madochannel Nov 18, 2024
511e548
Update README.md on github for conflict
madochannel Nov 18, 2024
bad96bd
update readme on conflict remote for conflict
madochannel Nov 18, 2024
1892e68
resolve conflict
madochannel Nov 18, 2024
f2f05af
Merge pull request #1 from madochannel/conflict-remote
madochannel Dec 1, 2024
783d712
update readme at my repo
madochannel Dec 1, 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動画講座用です．
自分のリポジトリで更新
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 create
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!!