mistake in the summary of actions #307

Open
HassanCehef opened this Issue Feb 26, 2013 · 0 comments

Comments

Projects
None yet
1 participant
@HassanCehef

Hi,

first of all, I'd like you to know how good your implementation of the gitflow is.
Here is a mistake I got today. The "Summary of actions" told me that the branch has been removed although it is not true, as announced before.

git flow feature finish myFunnyfeature
Switched to branch 'develop'
Your branch is ahead of 'origin/develop' by 1 commit.
Merge made by the 'recursive' strategy.
Ball.cc | 14 ++++++++++++++
Ball.h | 4 ++++
GameModel.cc | 18 +++++++++++++-----
3 files changed, 31 insertions(+), 5 deletions(-)

warning: not deleting branch 'feature/myFunnyfeature' that is not yet merged to
'refs/remotes/origin/feature/myFunnyfeature', even though it is merged to HEAD.
error: The branch 'feature/myFunnyfeature' is not fully merged.
If you are sure you want to delete it, run 'git branch -D feature/myFunnyfeature'.

Summary of actions:

  • The feature branch 'feature/myFunnyfeature' was merged into 'develop'
  • Feature branch 'feature/myFunnyfeature' has been removed
  • You are now on branch 'develop'

I hope this will help you improving your project.
Regards.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment