merge merge --no-ff
ti jiao bug
bug tijiao
ff
master add
duorenxiezuo
wocao