So how does git work in the real world
Git is a beautiful concept and sometimes a general workflow cheatsheet is needed to reference best practices.
This document uses square brackets, [ ], to represent some information that the user is required to enter. The document will do its best to explain where the required information can be found.
- Setting up your git environment variables
- Cloning the Master Repository
- From Master to Develop
- Pulling Changes from Develop
- Creating your own branch
- Modifying and Editing your Files
- Staging your files for commit
- Commiting your files
- Pushing your branch upstream
- Asking for a pull request
- Peer review
You got an awesome new job at a company that heavily uses GIT! You are a kick ass developer who used another repository at your old company. Your first task is to get the project onto your computer.
Cloning a repository
git clone [git url]
When we create our first project we create a repository called master by default. In the real world we like to create what we call a branch. A branch is a separate self contained box we can work in without effecting other peoples work spaces.
A develop branch separates our live codebase from our work in progress codebase.
Checking out the develop branch of our project
git status
git checkout develop
git status
A bunch of our collegues have been working hard on implementing a set of really cool features, so how do we get all these changes they have done? We use gits most awesome feature. We can pull from any branch that we have checked out.
git pull
So your manager says that he needs you to add a feature into the current site. It's simples, he wants you change the background color of the whole website from white to a light grey. This is a perfect opportunity to create our own branch. Remember, creating our branch is just another way of making a self contained box that we can work in without effecting any other developers.
Branches should be meaningful and a suggestion is to always give a short clear description of what you will be working on in your branch. For example we could us bugfix/remove_extra_image or feature/add_banner_image or enhancement/change_background_color
git checkout develop
git pull
git branch enhancement/add_background_image
git checkout enhancement/add_background_image
So you open your CSS file and find the part you need to change, you set background-color to the color #CFCFCF. Your boss is happy with the final color and your are happy with the work you have done. Awesome, time to check the files we changed in out branch.
git status
git add .
git commit -m "Added my really cool background image"
git log
git log
git commit --fixup [commit id]
git push
React
Typescript
Django
Laravel
Facebook
Microsoft
Google
Alibaba
D3
Tencent