We have a small digital team (3 designers, 3 developers) and we want to integrate Git into our system.
Currently, for most of our sites, we have an intermediate site (dev.example.com) and a production site (example.com). Our developers usually make code changes to the local version, transfer these changes to the intermediate site, and then, after approval, these changes are transferred live. Our designers, on the other hand, make small changes (when the developers are too busy) directly on the intermediate site, and then push them in real time after approval. In addition, in some cases we do not have an intermediate site, and changes are submitted directly to the production site.
I know that different workflows are not ideal, but what would be the best way to integrate Git into this current system and simplify the workflow (for designers)? Should our current workflow be standardized first before enabling Git (i.e., Intermediate sites are required, and developers must be developed locally before clicking on the stage) or are Git flexible enough to work as it is?
I am new to Git, but read that push should only be done to a bare repository. It's necessary? If so, could this be an intermediate site? Or should it be its own entity (i.e., on an internal server, for example example.local)?
Would a good workflow be like this:
- The user retrieves and merges the bare repository into a local repository.
- The user develops locally and commits the changes to the local repository.
- The user redirects the changes to the bare repository to example.local (or something similar)
- User pulls changes from bare repository to staging repository dev.example.com
- Upon approval, the user pulls the changes from the bare repository to the example.com product repository
My only problem with this workflow is that the bare repository seems unnecessary ... no? And finally, I understand what would be registered in the local repository (users change, comment, etc.), but I do not understand what will be registered in the bare repository (after pushers), staging (after pulling) and production ( after stretching); Could all of these steps be tracked and logged easily?
!