在生产环境中从SVN迁移到Git

Question

I have been tasked with migrating from SVN to Git, but I am unsure how to do so with the current setup in place. Here is how the SVN repository works at the moment:

We have a development server and a production server, both of which are connected to a single SVN repository. We make changes locally and save it to the development server. Whenever we are satisfied with these changes, we commit them to the svn repository from the development server (svn commit...), then update them on the production server (svn update...)

We now want to use Git, but I am unsure how to reflect the same or similar behaviour. I initially thought of having a single Git repository with two branches (dev and master). The only thing is, both the development and production servers are not in sync; there are a lot of files with changes on them on the development server and vice versa. How best can I approach this dilemma?

Edit: I see this far too often. Please specify a reason for downvoting so I can improve my answer.

Answer 1

Git and SVN are both version control systems, but they don't work in exactly the same way. They have different workflows.

Git is a distributed version control system, see https://en.wikipedia.org/wiki/Distributed_version_control

I would suggest starting with a single shared Git repository with a single branch, and a local repository on each developer's workstation. Create the developers' repositories by cloning the shared repo. Then you have to get used to adding an additional step into your workflow: on SVN you used to just 'commit', on Git you will have to 'commit' and then also 'push' to the shared repository.

Then read the Git from SVN page here: https://git-scm.com/course/svn.html This will help you understand Git from an SVN perspective.