can't change my php project to develop branch with git in windows when merge

Question

Hello all I am intermediate in git and want to merge develop into master branch.

When i checkout to master it was good but, when merge with my develop branch i get this error with the following command :

git merge develop 


**error: cannot stat 'empresas/presupuesto/acciones': Permission denied**

And then force the checkout with -f command

git checkout -f develop 

the response was :

**fatal: cannot create directory at 'empresas/presupuesto/acciones': Permission de nied**

can't change to develop now. any kind help?

UPDATE LASTEST LOG:

    Usuario1@MiPC MINGW64 /c/xampp/htdocs/scmsistema (master)
$git rebase --continue
No rebase in progress?

Usuario1@MiPC MINGW64 /c/xampp/htdocs/scmsistema (master)
$ git rebase --abort
No rebase in progress?

The link I mentioned suggests closing every process accessing the repo, plz read whole post and let me know if we need more solution. — hessam hedieh, Jan 12 '19 at 05:15
@hessamhedieh dear contributor. not solved need to delete master and clone develop into a fresh master — Elvis Technologies, Jan 12 '19 at 05:24
Im glad u find the solution, but as this question is duplicate of link, (as u found answer there) there is little value to add answer here, maybe u should consider deleting the post if u want — hessam hedieh, Jan 12 '19 at 05:26
@hessamhedieh hey i go to many conflicts now in master to solve can you help me to delete master and clone develop to a fresh branch master? — Elvis Technologies, Jan 12 '19 at 05:28

hessam hedieh · Accepted Answer · 2019-01-12T05:56:24.780

1

First part of question is found here

for re creating master simply do this on develop branch

git branch -d master
git checkout -b master

if you have uncommited work in master and dont mind losing them use

git checkout -- .

for more info on above command see here

edited Jan 12 '19 at 05:56

answered Jan 12 '19 at 05:35

hessam hedieh

780
5
18

can you explicite the -- . for education pourposes. – Elvis Technologies Jan 12 '19 at 05:41
when i try to change to master from develop it is was many code conflicts (like 500+) , but in develop i have the fresh code then with hessam say delete master and checkout -b like a charm! thanks!. – Elvis Technologies Jan 12 '19 at 05:49
Your branch is up to date with 'origin/develop'. – Elvis Technologies Jan 12 '19 at 05:53
@ElvisTechnologies, You are welcomed, Edited my answer for a link to `git checkout -- .`. – hessam hedieh Jan 12 '19 at 05:57

can't change my php project to develop branch with git in windows when merge

1 Answers1