[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@…):

 I updated my currently queued `git-flow` update (ticket:41609) to include
 `subports` for
 * the better maintained [https://github.com/petervanderdoes/gitflow AVH
 Edition],
 * [https://github.com/datasift/gitflow HubFlow] for use w/ GitHub,
 * a `git-flow-devel` that points to
 [https://github.com/nvie/gitflow/tree/develop nvie's develop branch] @
 [https://github.com/nvie/gitflow/tree/15aab26490facf285acef56cb5d61025eacb3a69
 15aab264]

 The last option should take care of getting past this `DOT_GIT_DIR` issue.
 I believe the AVH Edition is the better choice, if you want to use a
 ''gitflow'' that is maintained.

 Ryan: updating the `git-flow` Portfile w/ the patch in ticket:41609 should
 address this ticket.

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