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

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

New feature #1261

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
3655178
add newfile
wtcode3 Aug 13, 2024
9128ae2
change name
wtcode3 Aug 20, 2024
d12584e
change name again
wtcode3 Aug 20, 2024
ac30c79
make new file
wtcode3 Aug 20, 2024
1764c3a
delete file
wtcode3 Aug 20, 2024
a11a0fb
new file
wtcode3 Aug 20, 2024
631b64c
add gitignore
wtcode3 Aug 20, 2024
d982b47
update readme
wtcode3 Aug 20, 2024
2de659a
update readme for automatic maerge
wtcode3 Aug 20, 2024
1bb233b
make new file for automatic merge
wtcode3 Aug 20, 2024
86dbcc9
Merge branch 'no-fast-forward'
wtcode3 Aug 20, 2024
a4dac1e
update readme on confilict branch for confilict
wtcode3 Aug 21, 2024
d1b6c20
update readme on main for conflict
wtcode3 Aug 21, 2024
4fdfadb
resolve conflict
wtcode3 Aug 21, 2024
0ba5e22
update readme on github
wtcode3 Sep 2, 2024
d053238
update readme on github for conflict
wtcode3 Sep 2, 2024
e22bb5b
update readme on conflict-remote for conflict
wtcode3 Sep 2, 2024
4cbeecc
resolve conflict2
wtcode3 Sep 2, 2024
d1ae2ca
Merge pull request #1 from wtcode3/conflict-remote
wtcode3 Sep 2, 2024
f3cd2d0
update readme at my repo
wtcode3 Sep 2, 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