title: Merge two separate projects/Git repos into one master project?
body: <p>I'm not sure how to ask this the best way, but we have a test server set up at work and we have a production server. We develop mostly on the test server then when done with a feature push the code (manually) to the production server.</p>
  
  <p>Now I've thought to get away from this we could use Git so I wrapped all the files and whatnots and created a Git repo. Great, the test server is set up.</p>
  
  <p>Now what? Set up another Git repository from the files (that are different) that are on the production server? Then? From there merge the two repos into a single repo?</p>
  
  <p>Note: some developers will edit files on the production server and won't move those files back to our test server (mainly because the feature they are working on isn't done yet) so now there is new changes that haven't been updated on our test server and new changes that need to now be moved to production.</p>