New feature - #1371

Open

Penchop wants to merge 20 commits into

D-S-Hub:mainfrom

Penchop:new-feature

Commits on May 6, 2026

add newfile
Penchop
committed
c597ee6

Commits on May 10, 2026

change name
Penchop
committed
f5fc246
change name again
Penchop
committed
345fc07
make new file
Penchop
committed
0e5c0dd
delete file
Penchop
committed
5ce4e4c
new file
Penchop
committed
5992d34

Commits on May 14, 2026

add gitignore
Penchop
committed
c0f3668

Commits on May 16, 2026

update readme
Penchop
committed
eb460b9

Commits on May 29, 2026

update readme for autmatic merge
Penchop
committed
f7ddea0
make new file for automatic merge
Penchop
committed
e851ae5
Merge branch 'no-fast-forward'
Penchop
committed
897c032

Commits on May 31, 2026

update readme on conflict branch for conflict
Penchop
committed
78c51ae
update readme on main for confilict
Penchop
committed
5c6eaad
resolve confilct
Penchop
committed
177bf08
Update README.md on GitHub
Penchop
authored
c46ab02

Commits on Jun 3, 2026

Update README.md on github for conflict
Penchop
authored
5c60bea
update readme on conflict-remote for conflict
Penchop
committed
79c5069
resolve conflict
Penchop
committed
6d2827d

Commits on Jun 12, 2026

Merge pull request #1 from Penchop/conflict-remote
Penchop
authored
c28e657
update readme at my repo
Penchop
committed
a3520cf