Adding GIT to copy of the source code

Question

On legacy project with 2 environments prod and dev.
We recently added git on prod and pushed all the changes in the master branch, and can now support this server better.

However I have trouble initiating the git tracking on our dev server, there code base there is a bit different and I can not just clone it fresh...

What are the proper steps to add git repository tracking, to existing code, similar to the master branch ?

I tried:

git init
git origin add remote ...
git branch --set-upstream master origin/master

But now all my local files are shown as locally deleted.

git checkout master shows conflict on all files
git pull says all is up to date

What are you trying to do? using one repo and add the second one to it? — CodeWizard
– CodeWizard, Commented Jan 29, 2016 at 14:13

Alexander Pogrebnyak · Accepted Answer · 2016-01-29 14:16:02Z

1

Clone your new repo to a stand-alone server
In cloned repo create a new branch develop
Rsync your codebase from your dev server into this repo
Commit 'develop' branch and push to remote.
Setup your dev server to track develop branch
Merge develop branch into master. This will be a new prod codebase.

Disclamer. This is not an endorsement of a proper release process, just the answer to OP problem

answered Jan 29, 2016 at 14:16

Alexander Pogrebnyak

45.8k10 gold badges111 silver badges123 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Adding GIT to copy of the source code

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related