问题：
branch diveraged
PS C:\Users\s14my9\itcaml\configuration> git checkout master
error: you need to resolve your current index first
config/Bridger-Infra-Agent/common.libsonnet: needs merge
config/Bridger-Infra-Agent/uncontrolled/dev1.libsonnet: needs merge
解决办法：
git reset --mergegit