New feature - #1374

Open

knks wants to merge 20 commits into

D-S-Hub:mainfrom

knks:new-feature

Commits on Jul 9, 2026

add newfiie
knks
committed
fcdeaff
change name
knks
committed
d8bc218
change name again
knks
committed
1ea1775
make new file
knks
committed
f17a375
delete file
knks
committed
0dcbb07
new file
knks
committed
8b6c05e
add gitignore
knks
committed
98f4d88

Commits on Jul 10, 2026

update readme
knks
committed
edb5773
update readme for automatic merge
knks
committed
30d2fbe
make new file for automatic merge
knks
committed
36e5b27
Merge branch 'no-fast-forward'
knks
committed
469c66d
update readme on conflict branch for conflict
knks
committed
244f689
update readme on main for conflict
knks
committed
687ff66
resolve conflict
knks
committed
d64e1d2
update readme on github
knks
authored
7c535fe
update readme on github for conflict
knks
authored
96f0cd1
update readme on conflict-remote for conflict
knks
committed
40cb236
resolve conflict
knks
committed
a5def31
Merge pull request #1 from knks/conflict-remote
knks
authored
b2a4655
update readme at my repo
knks
committed
3604934