Accidentally created a git submodule

So I was developing a API Client gem, which was working great, had it’s own github repository and my team lead decided that he wanted me to move this client api into the api repository itself. So I copied the files over into it’s own directory, removed the .git directory from the client’s directory, and merged it into master. Worked great.

However, now when I try to create a branch off of master, the directory shows up a submodule on github, and isn’t tracked in my local git. There is no .gitmodules folder, and no mention of submodules whatsoever. I can’t create a new branch because it says that there are untracked files that will get overwritten (all the files in my client gem directory) but as far as I can tell there’s no way for me to start tracking these files. I can access the directory just fine, but as soon as I modify a file, the change doesn’t show up in the api projects git.

  • Is it possible to directly install a gem from a git repository?
  • have bundler use http: instead of git:?
  • vagrant install plugin from github
  • Error while fetching git file using Bundler
  • rake release fail (using gem bundler)
  • Revert to a gem version based on commit
  • What do I do?

  • What is the npm tmp directory? Can I delete it?
  • Heroku app to automate deploys from GitHub
  • Git branching and switching back to master is ahead?
  • Is it safe to use git with multiple users when the central repository is on a windows file share?
  • what does using gitflow offer a git user?
  • git clone stuck during a Capistrano deploy
  • 2 Solutions collect form web for “Accidentally created a git submodule”

    Running git rm --cached --ignore-unmatch client then allowed me to git add client/

    If there is no .git folder or file in that subfolder, all you need to do is git rm --cached [folder] followed by git add [folder]/*

    Git Baby is a git and github fan, let's start git clone.