I am learning git-flow and I just did git flow feature finish
, which merged my feature branch to develop and removed it.
Instead of thi
These steps should do the trick:
Get the sha's needed:
git log
<sha1>
is the commit right before the merge
<sha2>
is the last commit on develop before you started working on the feature
git checkout develop
git checkout -b feature/<feature-name>
git reset <sha1> --hard
git checkout develop
git reset <sha2> --hard
Push your feature branch.