[MacPorts] #44401: git-flow @0.4.1_1 git flow feature finish with conflict -> error

[MacPorts]

#44401: git-flow @0.4.1_1 git flow feature finish with conflict -> error
------------------------------+------------------------------
  Reporter:  philippe.lang@…  |      Owner:  jason-macports@…
      Type:  defect           |     Status:  new
  Priority:  Normal           |  Milestone:
 Component:  ports            |    Version:  2.3.1
Resolution:                   |   Keywords:
      Port:  git-flow         |
------------------------------+------------------------------

Comment (by jason-macports@…):

 Works for me:
 {{{
 $ mkdir x
 $ cd x/
 $ git init .
 Initialized empty Git repository in /.../x/.git/
 $ git flow init
 ...
 $ git flow feature start f1
 Switched to a new branch 'feature/f1'
 ...
 $ touch file1.txt
 $ git add file1.txt
 $ git commit file1.txt -m"f1: add file"
 ...
 $ git flow feature finish f1
 Switched to branch 'develop'
 Updating 1fe2597..3e8d799
 Fast-forward
  file1.txt | 0
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file1.txt
 Deleted branch feature/f1 (was 3e8d799).

 Summary of actions:
 - The feature branch 'feature/f1' was merged into 'develop'
 - Feature branch 'feature/f1' has been locally deleted
 - You are now on branch 'develop'
 $ git log --decorate --oneline
 3e8d799 (HEAD, develop) f1: add file
 1fe2597 (master) Initial commit
 }}}

 Granted, this was a ''fast-forward'' exercise, but things seem to be set
 properly for me,
 using `macports 2.3.1`, `git-flow @0.4.1_1`.

 Did I miss something in the case setup?

-- 
Ticket URL: <https://trac.macports.org/ticket/44401#comment:3>
MacPorts <http://www.macports.org/>
Ports system for OS X