Git Flow Release Finish - Permission denied

Question

I have been working with git flow a while and now it is time to finish the first release v1.0.0. I am using SourceTree on Windows for that.

When I wanted to finish the release it I got this error:

sh.exe C:\Users\xy\AppData\Local\Atlassian\SourceTree\gitflow_local\gitflow\git-flow release finish -f C:\Users\xy\AppData\Local\Temp\2ffrpxef.20z v1.0.0
Switched to branch 'master'

error: unable to create file component/admin/config.xml (Permission denied)

There were merge conflicts.

Completed with errors, see above.

I have no idea why this error is occuring as there should not be any file permission issues as that never happened before when working in the feature branch.

After the above failed I had basically all my changes from develop in relation to master in my working copy. I have simply dashed all those changes and removed new files and so on. No there are no conflicts present. So I am again ready to finish my release.

Currently develop and the release are on the same stage and of course a lot of commits ahead of master:

How can I finish my release without running into this issue?

Is there some way to force the current develop/release stage upon master? Basically all the development commits should be applied onto the master branch - so all merge conflicts when they appear I'd like to solve with the development branch version. Is that possible?

Answer 1

I found someone that could help me with the issue and he had the idea that is was related to some other process locking the file.

To verify this I copied my repository somewhere else, opened it with SourceTree and I was able to do the release finish without an issue.

Hence I guess it is related to the file being locked from something.

Although I had suspected my IDE (PHPStorm), I could not pinpoint it as I closed it and then still had the file permission problem. Maybe it is Dropbox (the whole repository is in there), who knows. But now I know at least a work around.