
Explore how to see changes in git using git diff, git show, and git status, stage modifications with git add, commit with messages, and review history with git log.
Create a release branch from develop, test and fix bugs, commit and push, then merge to master and develop to finalize release version 1.0 for production.
Create a hotfix branch from master, fix urgent bugs, commit, and merge the fix back into both master and develop to keep production stable and development aligned.
Learn how to handle git merge conflicts, simulate conflicts by branching and editing code, and resolve them manually or with graphical merge tools like PhpStorm in a team workflow.
Copy specific changes between branches using git cherry-pick to apply a commit from a feature branch to develop. Note that this can duplicate commits, so merge is preferable when possible.
Configure git globally and per project, set user name, email, and editor, and create aliases for common commands like status, branch, checkout, and push to streamline workflows.
Install diff-so-fancy to prettify git diffs with color-coded additions and deletions, improving readability in your terminal. Configure the global diff-so-fancy settings and core pager for consistent highlighting across projects.
This course starts from scratch, you don't need to know anything about Git or version control systems!
You'll learn all about installing Git, creating commits, working with branches, pushing to Github, merging features, correct workflow, resolving conflicts, writing custom aliases and much more!
And if you do get stuck, you benefit from an extremely fast and friendly support in discussions to the course.
Git is the most popular and powerful version control system nowadays. It allows you to control all your file changes and work as a team.
Learn all the fundamentals you need to know and benefit from them your whole life as a developer!
Specifically you will learn:
How to install git
How to initialise Git project and adjust basic configuration
How to create commits
How to check any commit content
How to push your code in remote repository on Github
What are branches and how to work with them
How to merge branches
What is the correct workflow with Git
What is gitflow and how to use it
How to create releases and hotfixes
How to create and use tags
How to resolve Git conflicts
Advanced git commands
How to configure git properly
How to create own git aliases
Don’t lose any time, gain an edge and start using Git as PRO now!