Hi!

At some point I was advised to use "git worktree" to have one py2 and
one py3 installation sharing the same git repository. Till one hour ago,
it worked fine.

Now, if I understand correctly, in my py2 worktree, I was on the develop
branch. There was one branch "foobar" (not its real name) that meanwhile
is fully merged, so that I thought it was safe to do "git branch -d foobar".
However, it seems that my py3 worktree was on that now deleted branch.

I am not totally sure if that's what was happening. Would git really
allow the "git branch -d" operation when another worktree is on that
branch?

In any case, my bash history shows that at some point I did
"git branch -d foobar", and when I am in the py3 worktree, I now get
  $ git log
  fatal: your current branch 'foobar' does not have any commits yet

Indeed, all files in the Sage tree are untracked, in the py3 worktree.
And that's why "git checkout develop" won't work (it tells me to commit
are stash first).

Can you please tell me how to recover from that mess?

Best regards,
Simon


-- 
You received this message because you are subscribed to the Google Groups 
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/sage-devel/qmljo4%245v23%241%40blaine.gmane.org.

Reply via email to