31 Jul
2014
31 Jul
'14
10:17 a.m.
#44401: git-flow @0.4.1_1 git flow feature finish with conflict -> error ------------------------------+------------------------------ Reporter: philippe.lang@… | Owner: jason-macports@… Type: defect | Status: closed Priority: Normal | Milestone: Component: ports | Version: 2.3.1 Resolution: fixed | Keywords: Port: git-flow | ------------------------------+------------------------------ Changes (by cal@…): * status: new => closed * resolution: => fixed Comment: r122828, see #41609. -- Ticket URL: <https://trac.macports.org/ticket/44401#comment:11> MacPorts <http://www.macports.org/> Ports system for OS X