#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@…): At first glance, it appears that `$DOT_GIT_DIR` is not properly set. It may be a while before I get time to debug anything useful. Could you provide a little more information on how you reproduce the issue? As an aside, the `nvie` branch has not been maintained for some time. I have an update to the git-flow `Portfile` that contains subports for the more up-to-date `AVH Edition` and `hubflow` for use w/ GitHub. I'm still working out the kinks in the completion subports, so it's not ready for submission just yet. Perhaps I should submit the update without the completions, and add those later? -- Ticket URL: <https://trac.macports.org/ticket/44401#comment:2> MacPorts <http://www.macports.org/> Ports system for OS X