G:\UnrealProjects\TCCD>git status
interactive rebase in progress; onto 119d09a
Last commands done (6 commands done):
   pick d46dfb4 Update BP_Pickup
   pick 23441bf Update shapematch
  (see more in file .git/rebase-merge/done)
Next commands to do (5 remaining commands):
   pick 8ead7b8 Fix shape match
   pick 8a19c24 Update Shape match
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'develop' on '119d09a'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean