7
별도의 저장소에서 서브 디렉토리를 이동 한 후 서브 모듈로 포함 시켰습니다.서브 디렉토리에있는 rebase와 디렉토리 이동
이제 변경 사항을 기반으로 다른 분기를 리베이스하려고합니다.
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
이 충돌을 어떻게 해결할 수 있습니까?