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

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

New feature #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f552582
add newfile
nyuki0821 Dec 28, 2024
0e14a9f
change name
nyuki0821 Dec 28, 2024
449dd6e
change commit again
nyuki0821 Dec 28, 2024
afdcac6
make new file
nyuki0821 Dec 28, 2024
6d00289
delete file
nyuki0821 Dec 28, 2024
308da2a
make new file
nyuki0821 Dec 28, 2024
fce2fb3
add gitignore
nyuki0821 Dec 28, 2024
2ac14b7
update readme
nyuki0821 Dec 28, 2024
be3b330
update readme for automatic merge
nyuki0821 Dec 28, 2024
58783be
make new file for automatic merge
nyuki0821 Dec 28, 2024
5a7bdae
update
nyuki0821 Dec 28, 2024
a26fbc1
update readme on conflict branch for conflict
nyuki0821 Dec 28, 2024
11ba488
update readme on main branch for conflict
nyuki0821 Dec 28, 2024
b3f2b17
resolve conflict
nyuki0821 Dec 28, 2024
e56b33a
Update README.md on github
nyuki0821 Dec 28, 2024
e7cd52b
Update README.md on github for conflict2
nyuki0821 Dec 28, 2024
6782470
update readme on conflict-remote for conflict
nyuki0821 Dec 28, 2024
52d5343
update for conflict
nyuki0821 Dec 28, 2024
185c8e6
resolve conflict
nyuki0821 Dec 29, 2024
36d707e
Merge pull request #1 from nyuki0821/conflict-remote
nyuki0821 Dec 29, 2024
0add7e2
update readme at my repo
nyuki0821 Dec 29, 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 @@
create 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!!