New feature - #1359

Open

asatetsu wants to merge 20 commits into

D-S-Hub:mainfrom

asatetsu:new-feature

Commits on Jan 15, 2026

newfile
asatetsu
committed
7c67730
change name
asatetsu
committed
8d126a8
change name again
asatetsu
committed
5090ff1

Commits on Jan 19, 2026

make new file
asatetsu
committed
6c9758d
delete file
asatetsu
committed
64e56e6
new file
asatetsu
committed
85023d5
add gitignore
asatetsu
committed
aadfbdc
update README
asatetsu
committed
b47df82

Commits on Jan 21, 2026

update readme for automatic merge
asatetsu
committed
e80c1a5
add newfile.txt
asatetsu
committed
0b7d7df
Merge branch 'no-fast-forward'
asatetsu
committed
40e18ee
update readme on conflict branch for conflict
asatetsu
committed
8650c48
update readme on main for conflict
asatetsu
committed
cdc58e0
resolve conflict
asatetsu
committed
c9bcce4
Update README to reflect changes on GitHub
asatetsu
authored
9ebbe72
Update README for second GitHub update
asatetsu
authored
77effe4
update readme on conflict-remote for conflict
asatetsu
committed
d6455e2

Commits on Jan 23, 2026

resolve conflict
asatetsu
committed
705300d
Merge pull request #1 from asatetsu/conflict-remote
asatetsu
authored
b2ec0e2

Commits on Jan 25, 2026

update readme ato my repo
asatetsu
committed
126bc77