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

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

New feature #1264

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
69f6003
add new file
Kosuke382 Aug 23, 2024
c089426
change name
Kosuke382 Aug 28, 2024
9bb7a5b
change name again
Kosuke382 Aug 28, 2024
82cd376
make new file
Kosuke382 Aug 28, 2024
dbd4a19
delete file
Kosuke382 Aug 28, 2024
24d3fbb
new file
Kosuke382 Aug 28, 2024
05d2918
add gitignore
Kosuke382 Aug 28, 2024
97827b7
update readme
Kosuke382 Aug 28, 2024
9fdd361
update readme for automatic merge
Kosuke382 Aug 28, 2024
b8db1a4
make new file for automatic merge
Kosuke382 Aug 28, 2024
3fb9983
Merge branch 'no-fast-forward'
Kosuke382 Aug 28, 2024
26d53a6
update readme on conflict branch
Kosuke382 Aug 29, 2024
ff1fd7b
update readme on main for conflict
Kosuke382 Aug 29, 2024
e44b849
resolve conflict
Kosuke382 Aug 29, 2024
1e4d3e7
Update README.md on Github
Kosuke382 Aug 30, 2024
9fb8f52
Update README.md on github for conflict
Kosuke382 Aug 30, 2024
b5a503f
update readme on conflict-remote for conflict
Kosuke382 Aug 30, 2024
9ce1ddc
resolve conflict
Kosuke382 Aug 30, 2024
fed5f0d
Merge pull request #1 from Kosuke382/conflict-remote
Kosuke382 Aug 30, 2024
1b90704
update reamde at my repo
Kosuke382 Sep 6, 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!!