I am looking to incorporate a web development workflow that allows me to do the following:
I am also new to Git. I have begun test the waters with Git in my personal projects, however the project I have inherited (with the production/staging environments) has not used any version control to this point.
Questions:
essentially I'm the single developer who was handed a fairly large project and I just want to try and make things as easy/straightforward on myself as possible. :)
The most popular Git workflow is the usage of pull requests. In this workflow a developer uses a server side functionality to request that commits from a branch (from the same or another repository) are integrated into another branch (in the same or another repository).
The Gitflow Workflow defines a strict branching model designed around the project release. This workflow doesn't add any new concepts or commands beyond what's required for the Feature Branch Workflow. Instead, it assigns very specific roles to different branches and defines how and when they should interact.
Git tracks file changes by the user creating a save point, or in Git terms a commit. Each commit takes a snapshot of the current file system rather than storing just the changes made since the last commit. This allows a commit ot be extracted and the whole history not required to rebuild the file system.
Branches are one way to facilitate this workflow. There is a great blog post about how to use Git branches to manage a typical development workflow.
You would then have one branch for production (e.g. master
), one for the live-edits which correspondes to the hotfix
branch in the post above, and another one for development.
To sync your local environments on laptop and desktop, you can use the aforementioned development
branch also as a remote branch and have both devices push their local commits on this branch to the remote repository.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With