hendry@x201 securityprivacy$ git commit
U core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2600/config.xml
U core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2600/index.html
U core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2600/main.js
U core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2620/config.xml
U core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2620/index.html
U core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2620/main.js
fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
hendry@x201 securityprivacy$ git rm core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2600/config.xml
core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2600/config.xml: needs merge
core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2600/index.html: needs merge
core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2600/main.js: needs merge
core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2620/config.xml: needs merge
core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2620/index.html: needs merge
core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2620/main.js: needs merge
fatal: pathspec 'core/securityprivacy/core/securityprivacy/3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2600/config.xml' did not match any files
hendry@x201 securityprivacy$