#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@…): When I try the recipe above, I also see the ''merge conflict'', which I believe is the correct response for the actions. However, I do not receive the `Permission denied` error from `git-flow-feature`: {{{ $ git flow finish f2 Switched to branch 'develop' Auto-merging file.txt CONFLICT (add/add): Merge conflict in file.txt Automatic merge failed; fix conflicts and then commit the result. There were merge conflicts. To resolve the merge conflict manually, use: git mergetool git commit You can then complete the finish by running it again: git flow feature finish f2 }}} -- Ticket URL: <https://trac.macports.org/ticket/44401#comment:5> MacPorts <http://www.macports.org/> Ports system for OS X