Please Explain? My git Workflow

Git is a versioning suite of tools that enables us to keep track of our projects changes. I will be going over the super basics, of which I may well be wrong. But I’m trying to nail down a firm git workflow, so here goes.

Every time I reach a major release I push it to the master branch and remote server for the client to view.

• Katie B.

What can Git version, and why should I care? Git can version anything that is a plain text file (and more). Versioning is a best way to completely mess up a website and then instantly restore it back to its working glory. It makes it a breeze to deploy completed products and It’s pretty much a standard for any programming job. One of the best things about Git is when you talk about it, you can usually start to see people’s ears start to bleed with boredom. It’s truly a magnificent approach to modern development, wrapped in a terminal shell, tasty!

Git does a few really simple, but hugely powerful things, like superman huge! Presenting the superpowers:

- Repository
- Commit
- Pull
- Merge
- Branch
- Push

####OK, Please Explain?

######What is a repository? A repository is a collection of your code, that you’ve created to host your code changes, from commits to pushes. A repository is the key aspect of Git and version controls.

######What is a commit? A commit is done when you’ve updated your code to account for a feature or other part of work you’ve done you add the changes back into your remote Git repo. When you commit changes, you include a message to describe what you did and why. This is the most important part of version control. When you share why you’ve made the changes you’ve made, you create a code base that is manageable but almost anyone.

######What is a pull? A pull can be one of two things, a pull or a pull request.

######A pull A pull is downloading the code from your repository. It is how you make sure you’re local code is up to date before you begin working on it. When you pull code, Git automagically checks the remote code against your local code. It will see if there are any differences, and do something called merging. A merge just zips the two files together so that you’re back down to just one, by showing you any conflicts and allowing you to fix them.

######A Pull request A pull request is when you have a large amount of changes you want to merge back into a main branch from your feature branch. A pull request opens your code up to peer review. After it’s been approved you then merge it back into the production or master branch.

######A merge A merge just zips the two files together so that you’re back down to just one, by showing you any conflicts and allowing you to fix them.

######A branch A branch is basically you checking out the whole repo and making major changes to it. When you’re done with your huge changes you make a pull request. After approval, you merge it back into the main branch.

######A push A push is when you’ve finished your commits. merges, and pull request, and are ready to send the files out to your deployment. You run a push command and you repo is uploaded to a remote server.

#####Starting the whole process:

Git is a tool that requires a bit of a larger team and management layers, but being a small and agile developer, I have still have a need version control. I am going to use Git to version as I had previously explained.

• First i will setup the development and production environment grunt nodejs bower Ruby etc

• When all set, then move to git by following these instructions.

• After Git is intialized I follow these simple steps to make a website function properly.

• I branch off the master branch and create one called development

• I build on the development branch, branching off for major features

• My _config.json points the uploads to the staging server, which IS the development branch.

• Every time I reach a major release I push it to the master branch and remote server for the client to view.

That’s just a brief explanation of how I use git. ❤️