#44401: git-flow @0.4.1_1 git flow feature finish with conflict -> error -----------------------------+-------------------------------- Reporter: philippe.lang@… | Owner: macports-tickets@… Type: defect | Status: new Priority: Normal | Milestone: Component: ports | Version: 2.3.1 Keywords: | Port: git-flow -----------------------------+-------------------------------- There seems to be a problem when finishing a feature with conflicts: {{{ [MBP git_test (feature/b)]$ git flow feature finish b Switched to branch 'develop' Auto-merging file1.txt CONFLICT (content): Merge conflict in file1.txt Automatic merge failed; fix conflicts and then commit the result. mkdir: /.gitflow: Permission denied /opt/local/bin/git-flow-feature: line 320: /.gitflow/MERGE_BASE: No such file or directory 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 b }}} Apparently a permission problem. I don't know if that problem is related to git-flow itself, or the OSX port, so I mentioned that problem on github as well: https://github.com/nvie/gitflow/issues/370 -- Ticket URL: <https://trac.macports.org/ticket/44401> MacPorts <http://www.macports.org/> Ports system for OS X