自动锁定常用列
Merge remote-tracking branch 'origin/master'