Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ad900e8
newfile
kiyose-yu May 13, 2025
9ee37be
update
kiyose-yu May 13, 2025
fac9778
test update
kiyose-yu May 16, 2025
678b8ad
newfile update
kiyose-yu May 17, 2025
d100413
chaged name
kiyose-yu May 17, 2025
a7a127d
chage name again
kiyose-yu May 17, 2025
b1dd395
make newfile
kiyose-yu May 18, 2025
eadd912
delete file
kiyose-yu May 18, 2025
df07d3a
newfile
kiyose-yu May 18, 2025
8d7a2e7
add gitignore
kiyose-yu May 18, 2025
f35ae20
modified file
kiyose-yu May 18, 2025
ec77005
update README
kiyose-yu May 23, 2025
085ffee
update automatic merge
kiyose-yu May 23, 2025
71db7b9
create newfile
kiyose-yu May 23, 2025
e17a699
up README
kiyose-yu May 24, 2025
5f760a8
add README.md
kiyose-yu May 27, 2025
c63e05d
update README
kiyose-yu May 27, 2025
3adba7b
update readme for automatic merge
kiyose-yu May 27, 2025
350d175
create new2file
kiyose-yu May 27, 2025
22a0a7e
Merge branch 'no-fast-forward'
kiyose-yu May 27, 2025
6494674
update readme on conflict branch
kiyose-yu May 27, 2025
e5e7f58
update readme on main for conflict
kiyose-yu May 27, 2025
616c411
resolve conflict
kiyose-yu May 27, 2025
0af3420
Update README.md on github
kiyose-yu May 29, 2025
6c34364
Update README.md for conflict
kiyose-yu May 29, 2025
d8c9b26
update README at Conflict-remote
kiyose-yu May 29, 2025
387c61c
Update README.md
kiyose-yu May 29, 2025
0e230a9
Resolve conflict
kiyose-yu May 29, 2025
71f735f
Merge pull request #1 from kiyose-yu/conflict-remote
kiyose-yu May 30, 2025
b0e39b3
update readme
kiyose-yu May 30, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#.gitignoreはgitの管理対象外を指定するファイル。
output.log
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# git-practice
このリポジトリはGit動画講座用です.
自分のリポジトリで更新
Empty file added delete_soon.txt
Empty file.
1 change: 1 addition & 0 deletions namechaged2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
newfile.txt作成
1 change: 1 addition & 0 deletions new2file.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
created new2file
1 change: 1 addition & 0 deletions newfile.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
main branchで新規作成。