2012-04-02 12 views
7

Ho spostato la sottodirectory in un repository separato e l'ho inclusa come sottomodulo.Git rebase e directory di spostamento nel sottomodulo

Ora voglio ribaltare un altro ramo in cima a quella modifica.

israfel:proj almad$ git rebase -i origin/master 
error: could not apply ae1fd9a... Commit message 
hint: after resolving the conflicts, mark the corrected paths 
hint: with 'git add <paths>' and run 'git rebase --continue' 
Could not apply ae1fd9a... Commit message 

israfel:proj almad$ git status 
# Not currently on any branch. 
# Changes to be committed: 
# (use "git reset HEAD <file>..." to unstage) 
# 
# Unmerged paths: 
# (use "git reset HEAD <file>..." to unstage) 
# (use "git add/rm <file>..." as appropriate to mark resolution) 
# 
# added by us:  views/docs/examples 
# 

israfel:proj almad$ git rm -rf views/docs/examples 
views/docs/examples: needs merge 
rm 'views/docs/examples' 
fatal: git rm: 'views/docs/examples': Operation not permitted 

israfel:proj almad$ git add views/docs/examples 
error: unable to index file views/docs/examples 
fatal: updating files failed 

israfel:apiary almad$ git rm -rf views/docs/examples 
views/docs/examples: needs merge 
rm 'views/docs/examples' 
fatal: git rm: 'views/docs/examples': Operation not permitted 

Come posso risolvere questo conflitto?

risposta

12

Prima di reset chiamata:

git reset views/docs/examples 
git rm -rf views/docs/examples