Each time I sit down to write particle firmware I do a git pull on the develop branch.
This evening I got this errror.
git pull remote: Counting objects: 810, done. remote: Compressing objects: 100% (247/247), done. remote: Total 810 (delta 495), reused 378 (delta 377), pack-reused 183 Receiving objects: 100% (810/810), 818.24 KiB | 95.00 KiB/s, done. Resolving deltas: 100% (544/544), completed with 175 local objects. From https://github.com/spark/firmware 02dc8b6..6f1c79f develop -> origin/develop * [new branch] archive/feature/electron -> origin/archive/feature/electron + 9c56d14...96fa622 feature/button-events -> origin/feature/button-events (forced update) * [new branch] feature/dct-control -> origin/feature/dct-control b762904..8c0d9b7 feature/docker-buildpack -> origin/feature/docker-buildpack * [new branch] feature/electron-hw-flow-control -> origin/feature/electron-hw-flow-control error: unable to resolve reference refs/remotes/origin/feature/electron/dcd: Not a directory error: Cannot lock the ref 'refs/remotes/origin/feature/electron/dcd'. ! [new branch] feature/electron/dcd -> origin/feature/electron/dcd (unable to update local ref) * [new branch] feature/mcp23017 -> origin/feature/mcp23017 f6ccc66..3c700fe feature/non-blocking -> origin/feature/non-blocking error: some local refs could not be updated; try running 'git remote prune origin' to remove any old, conflicting branches