search

nvie / gitflow

Git extensions to provide high-level repository operations for Vincent Driessen's branching model.
http://nvie.com/posts/a-successful-git-branching-model/
Other
26.62k stars 2.66k forks source link

git flow feature finish with conflict -> error #370

Open plang opened 10 years ago

plang commented 10 years ago

This is the error I got with

... installed with the ports system under OSX 1.9.4.

[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

This is apparently a permission problem. Should I report that to the port maintainer maybe?

plang commented 10 years ago

I did: https://trac.macports.org/ticket/44401

the0ther commented 10 years ago

i'm not using MacPorts, I'm using Homebrew and got the same result.

veloxy commented 9 years ago

Getting the same issue here on Debian

$ git flow feature finish optimizations
rm: cannot remove `/.gitflow/MERGE_BASE': Permission denied
Switched to branch 'develop'
Auto-merging controllers/users_controller.php
Auto-merging controllers/shop_controller.php
CONFLICT (content): Merge conflict in controllers/shop_controller.php
Auto-merging config/database.php
Automatic merge failed; fix conflicts and then commit the result.
/usr/lib/git-core/git-flow: 320: /usr/lib/git-core/git-flow: cannot create /.gitflow/MERGE_BASE: Permission denied

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 optimizations
soloradish commented 9 years ago

Getting the same issue on OSX

Switched to branch 'development'
Your branch is ahead of 'origin/development' by 6 commits.
  (use "git push" to publish your local commits)
Auto-merging glance/views/approval.py
CONFLICT (content): Merge conflict in glance/views/approval.py
Auto-merging glance/templates/approval/project_detail.html
Merge branch 'feature/apply-flow-changlog' into development
Automatic merge failed; fix conflicts and then commit the result.
mkdir: /.gitflow: Permission denied
/usr/local/Cellar/git-flow/0.4.1/libexec/bin/git-flow-feature: line 320: /.gitflow/MERGE_BASE: No such file or directory
publysher commented 9 years ago

Had the same issue. Turned out this is identical to #53 , which is solved on develop but never released.

Homebrew uses the official 0.4.1 release which does not contain this fix.