[MacPorts] #44401: git-flow @0.4.1_1 git flow feature finish with conflict -> error
MacPorts
noreply at macports.org
Thu Jul 24 00:03:27 PDT 2014
#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 philippe.lang@…):
Hi,
Here is a sequence that reproduces the permission error:
{{{
mkdir foo
cd foo
git init .
git flow init
git flow feature start f1
git checkout develop
git flow feature start f2
git checkout feature/f1
echo "content1" > file.txt
git add file.txt
git commit -m "commit"
git flow feature finish f1
git checkout feature/f2
echo "content2" > file.txt
git add file.txt
git commit -m "commit"
git flow feature finish f2
}}}
The last command gives:
{{{
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.
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 f2
}}}
I could also see the problem is certainly related to "$DOT_GIT_DIR". But
how/why, I don't know!
As a side-note, I would like to add that the OSX Git App "Tower 2.0" is
bundled with git 2.0.0, and I'm not able to reproduce the bug with it,
from the UI.
--
Ticket URL: <https://trac.macports.org/ticket/44401#comment:4>
MacPorts <http://www.macports.org/>
Ports system for OS X
More information about the macports-tickets
mailing list