Here's my situation:
- I have an existing git repository
- I have code on an active staging server that has been manually kept in sync with what's in the repository, but is not currently under version control.
- I want to put that code under version control, WITHOUT blowing it away and doing a git clone, as there would be significant re-configuration that would be needed. I want to start being able to just do git pull to start updating it from that moment forward.
I know from having done testing of this locally (git init
, git remote add origin
) that it will see all files in that folder as untracked. If I were to add and commit them, then merging origin/master would cause a conflict with all of them.
Is there a way to seamlessly "insert" an existing repository alongside an existing installation to put it under version control? Note that any upload folders and configs are NOT under version control, so there is no worry about conflicts with these.