17:49 ~/git/r (feature/resetball)$ git commit -a
[feature/resetball fb0fda3] Implemented resetting of the ball.
 6 files changed, 732 insertions(+), 673 deletions(-)
17:49 ~/git/r (feature/resetball)$ git flow feature finish resetball
Switched to branch 'develop'
Updating e683166..fb0fda3
Fast-forward
 pinball.json    | 1374 ++++++++++++++++++++++++++++---------------------------
 src/box.cpp     |    2 -
 src/box.h       |    5 +-
 src/collide.cpp |    5 +
 src/game.cpp    |   17 +
 src/game.h      |    2 +
 6 files changed, 732 insertions(+), 673 deletions(-)
Deleted branch feature/resetball (was fb0fda3).

Summary of actions:
- The feature branch 'feature/resetball' was merged into 'develop'
- Feature branch 'feature/resetball' has been removed
- You are now on branch 'develop'

17:49 ~/git/r (develop)$