[MacPorts] #44401: git-flow @0.4.1_1 git flow feature finish with conflict -> error
MacPorts
noreply at macports.org
Tue Jul 29 23:21:07 PDT 2014
#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 philippe.lang@…):
Hi, I cannot explain why, but for me this patch works:
https://github.com/nvie/gitflow/commit/a7a89cdb13e0022c67fe2cd688708826828a60d6
I applied the patch to {{{/opt/local/bin/gitflow-common}}}.
--
Ticket URL: <https://trac.macports.org/ticket/44401#comment:8>
MacPorts <http://www.macports.org/>
Ports system for OS X
More information about the macports-tickets
mailing list