Git rebase and moving directory in submodule

I have moved subdirectory in separate repository and then included it as submodule.

Now I want to rebase another branch on top of that change.

  • Stage files with specific extension, and only those that show as modified in git status
  • error: The branch 'yourname' is not fully merged with removed remote
  • Create symlink file hierarchy from git branches
  • Git: Fork GitHub Repo into different Repo
  • How can I tell git to ignore LibreOffice lock files?
  • Fastlane Appfile in GIT? How to retrieve current apple_id?
  • 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
    

    How can I resolve this conflict?

  • fatal: unable to access 'x.git': Received HTTP code 404 from proxy after CONNECT
  • Git auto-pull using cronjob
  • How can I merge a git branch so that topic commits are orphaned?
  • How to extract value from the string in bash?
  • git log shows (origin) without any branch
  • add empty src folder to GIT repository
  • One Solution collect form web for “Git rebase and moving directory in submodule”

    First call reset :

    git reset views/docs/examples
    git rm -rf views/docs/examples
    
    Git Baby is a git and github fan, let's start git clone.