跑了'git checkout stash'，现在想用我藏匿的当前未附加分支覆盖现有分支

Question

So I messed up a bit in my branches and they weren't building, fortunately I had the project working stashed so i did a

git checkout stash

and that reverted my project to building successfully. I now want to overwrite an existing branch called 'develop' with my current unattached branch. Essentially i just want the name of the 'develop' branch but i want everything in it gone and replaced with my current stash branch. For reference when i run

git s

currently i get:

## HEAD (no branch)
?? Project/Setup_BACKUP_38164.swift
?? Project/Setup_BASE_38164.swift
?? Project/Setup_LOCAL_38164.swift
?? Project/Setup_REMOTE_38164.swift

Many thanks!

Answer 1

You will want to do a git show to get the SHA1 commit ID of the current HEAD. With that information, switch to the develop branch and run the command:

git merge abc123

Where "abc123" is the SHA1 ID.