others“
；
branh test
create a branch named feature1
feature2
confict fixed
delete
ssd
blank p
add others
“s”
add
add
sds
sd
stash
stash
stash fixed conflict