https://blog.csdn.net/qq_36150631/article/details/81038485
Create DEV branch and switch to the branch
edit file in DEV branch, update DBpass value from aaa to bbband check in dev branch
check in under DEV branch
switch to master branch , verify the value is not changed now
run merge in master branch
