Confict remote - #1375

Open

masae105 wants to merge 16 commits into

D-S-Hub:mainfrom

Commits on Jul 19, 2026

first commit
masae105
committed
d2eff0d
update README
masae105
committed
ccbc182
add namechange file
masae105
committed
74ce3f0
change name agein
masae105
committed
62de1ea
delete file
masae105
committed
39cba89

Commits on Jul 20, 2026

add gitignore
masae105
committed
b084b53
resolve README conflict
masae105
committed
761229b
update readme
masae105
committed
81ba299
update readme for automatic merge
masae105
committed
ca6fdb1
make new file
masae105
committed
152e338
Merge branch 'no-fast-forward'
masae105
committed
5af680a
update readme on conflict branch for conflict
masae105
committed
9fcd912
.update readme on main for conflict
masae105
committed
15fa916
resolve conflict
masae105
committed
8649984

Commits on Jul 21, 2026

Update README on github
masae105
authored
f08b7f7
update readme on github for conflct
masae105
authored
2a11db4