#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@…): Replying to [comment:8 philippe.lang@…]:
Hi, I cannot explain why, but for me this patch works:
https://github.com/nvie/gitflow/commit/a7a89cdb13e0022c67fe2cd688708826828a6...
I applied the patch to {{{/opt/local/bin/gitflow-common}}}.
Based on the old code, `... > /dev/null 2>&1` will always produce null output. Looks like a bug, and is so acknowledged in the [https://github.com/nvie/gitflow/commit/a7a89cdb13e0022c67fe2cd688708826828a6... commit a7a89cdb] you found. If you patch your Portfile w/ the attachment in mentioned in comment:9, you can uninstall `git-flow` and install `git- flow-devel` to access the latest `develop HEAD`, which is approaching 2 yrs old ... -- Ticket URL: <https://trac.macports.org/ticket/44401#comment:10> MacPorts <http://www.macports.org/> Ports system for OS X