hendry@x201 securityprivacy$ git status # On branch master # Your branch and 'origin/master' have diverged, # and have 4 and 1 different commit(s) each, respectively. # # Changes to be committed: # # renamed: 3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2600/config.xml -> SP-2600/config.xml # new file: SP-2600/index.html # new file: SP-2600/main.js # renamed: 3.8.2_Privacy_Considerations_for_Device_Property_Access/SP-2620/config.xml -> SP-2620/config.xml # new file: SP-2620/index.html # new file: SP-2620/main.js # # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: SP-2600/main.js # modified: SP-2620/main.js # # Untracked files: # (use "git add ..." to include in what will be committed) # # ../GNUmakefile # SP-2090/ # ../webstandards/2.1.1.HTML/WS-0030/foobar # ../../indextext.html # ../../matches.txt hendry@x201 securityprivacy$ git commit -a 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-2620/config.xml fatal: 'commit' is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm ' 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-2620/config.xml: 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$