1.配置文件修改
Merge branch 'master' of E:\IdeaSpace\ManageA with conflicts.
Merge remote-tracking branch 'origin/master'
1.增加.idea与app.iml的文件忽略