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 #1287

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
+4 −0
Open

New feature #1287

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
3e35483
add newfile
hara4890 Dec 21, 2024
f88c801
change name
hara4890 Dec 21, 2024
d22d237
change name again
hara4890 Dec 21, 2024
f8e81df
make new file
hara4890 Dec 21, 2024
283966e
delete file
hara4890 Dec 21, 2024
eb13565
new file
hara4890 Dec 21, 2024
ad95529
add gitignore
hara4890 Dec 21, 2024
95c0dc6
update readme
hara4890 Dec 22, 2024
f5a319f
update readme for automatic merge
hara4890 Dec 22, 2024
6f3dd3a
make new file for automatic merge
hara4890 Dec 22, 2024
68e48ed
Merge branch 'no-fast-forward'
hara4890 Dec 22, 2024
01e31f0
update readme on conflict branch for conflict
hara4890 Dec 22, 2024
3c03acc
update readme on main for conflict
hara4890 Dec 22, 2024
7ea7aa6
resolve conflict
hara4890 Dec 22, 2024
6a4eacf
update readme on github
hara4890 Dec 23, 2024
362972d
update readme on github for conflict
hara4890 Dec 23, 2024
b6d551b
update readme on conflict-remote for conflict
hara4890 Dec 23, 2024
4ab5de7
resolve conflict
hara4890 Dec 23, 2024
4fd2329
Merge pull request #1 from hara4890/conflict-remote
hara4890 Dec 23, 2024
f02460b
update readme at my repo
hara4890 Dec 26, 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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# 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作成
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!!