Due to the issue reported in Failed adjusted branch update after error in drop, my git-annex repo is now is a limbo state:
$ git branch --show-current
adjusted/master(unlockpresent)
$ git annex drop dirF/
drop dirF/a/a1.txt ok
drop dirF/a/a2.txt ok
[...]
error: Your local changes to the following files would be overwritten by checkout:
dirF/a/a1.txt
dirF/a/a2.txt
[...]
Aborting
Updating adjusted branch failed.
(recording state in git...)
$ git status
HEAD detached at 9d92415fb
nothing to commit, working tree clean
What is the recommended course of action to (safely) return to the adjusted/master(unlockpresent)
branch?
Is it safe to just use git annex adjust --unlock-present
?
You can just run "git checkout adjusted/master(unlockpresent)" to switch back to that branch.
It's fine to switch between adjusted and other branches, though the way git-annex failed and left your head detached is certainly a bug.
Thanks!
For the record, this is what git will say after
git checkout "adjusted/master(unlockpresent)"