git - How to clean working directory after closing a feature branch put old code into develop -

i'm working on project uses git-flow, feature branches have been left dangling. want clean things i'm not familiar git-flow in practice.

i used tower's git-flow "finish feature" on branch, noticed working directory contains code has been superseded while ago.

in hindsight, guess should have rebased code on feature branch use latest develop branch available, thought git-flow did automatically.

how clean mess (i.e. return working directory latest status of develop branch) , how merge old feature branches without reverting code?

thanks!

i'm not entirely sure understood problem.

here's got :

you have feature branch started while ago, several changes having been made on develop (master)

git checkout develop git fetch -p git pull origin develop (or whatever main branch called) git checkout myfeaturebranch git merge develop 

now files correctly updated, you'll conflicts if touched same files. files conflicts show, can check them writing command

git status 

when done fixing conflicts, normal add , commit commands.