You must be logged in to view this content.
Features
- The sections of this course have been carefully curated and selected to ensure you get the most value possible in the shortest amount of time. Proper use of Git is a true game changer, and this course will help you master it effectively.
- 1 - Git Tricks and Tips: In this section, we will look at commands which will make your life easier day by day. We will speak about branch handling, the best way to use one specific command for creating, modifying and deleting branches depending on the use case.
- 2 - Understanding and Resolving Merge Conflicts: In this section, you will reproduce step by step the creation of merge conflicts. I will then explain how to fix the merge conflict with the command git merge.
- 3 - Advanced Conflict Resolution with Rebase: In this section, we will look at how to solve conflicts with git rebase through two use cases.
- Finally, I will teach you an alternative to rebase and git merge to make the conflict resolution smoother.
Target audiences
- Junior Developers using Git daily
Curriculum
- 5 Sections
- 35 Lessons
- 1 Hour
Expand all sectionsCollapse all sections
- Intro5
- I - Git Tips & Tricks27
- 2.11.1 – Create a feature branch locally by switching to it
- 2.21.1 – Create a feature branch locally by switching to it4 Questions
- 2.31.2 – Create a feature branch locally staying on main
- 2.41.2 – Create a feature branch locally staying on main3 Questions
- 2.51.3 – Rename a local branch not pushed yet (command)
- 2.61.3 – Rename a local branch not pushed yet (command)3 Questions
- 2.71.4 – Rename a local branch already pushed – Intro
- 2.81.4 – Rename a local branch already pushed – Intro1 Question
- 2.91.5 – Rename a local branch already pushed – Reproduce issue
- 2.101.5 – Rename a local branch already pushed – Reproduce issue2 Questions
- 2.111.6 – Rename a local branch already pushed – Solution
- 2.121.6 – Rename a local branch already pushed – Solution3 Questions
- 2.131.7 – Delete a local branch (command)
- 2.141.7 – Delete a local branch (command)3 Questions
- 2.151.8 – Git revert or reset – Intro
- 2.161.8 – Git revert or reset – Intro1 Question
- 2.171.9 – [IMPORTANT] For the next sections
- 2.181.10 – Git revert or reset – Remove committed sensitive data
- 2.191.10 – Git revert or reset – Remove committed sensitive data3 Questions
- 2.201.11 – Git revert or reset – Unify messy commits locally before pushing
- 2.211.11 – Git revert or reset – Unify messy commits locally before pushing2 Questions
- 2.221.12 – Git revert or reset – Fix bad commit pushed to production
- 2.231.12 – Git revert or reset – Fix bad commit pushed to production4 Questions
- 2.241.13 – Git revert or reset – Merged the wrong branch
- 2.251.13 – Git revert or reset – Merged the wrong branch4 Questions
- 2.261.14 – Remove one file only one the remote repository
- 2.271.14 – Remove one file only one the remote repository3 Questions
- II - Understanding and Resolving Merge Conflicts16
- 3.12.1 – Git merge – No conflict – Intro
- 3.22.1 – Git merge – No conflict – Intro4 Questions
- 3.32.2 – Git merge – No conflict – First PR
- 3.42.2 – Git merge – No conflict – First PR4 Questions
- 3.52.3 – Git merge – No conflict – Second PR
- 3.62.3 – Git merge – No conflict – Second PR4 Questions
- 3.72.4 – Git merge – One conflict – Intro & First PR
- 3.82.4 – Git merge – One conflict – Intro & First PR4 Questions
- 3.92.5 – Git merge – One Conflict – Second PR – Intro
- 3.102.5 – Git merge – One Conflict – Second PR – Intro4 Questions
- 3.112.6 – Git merge – One conflict – Second PR
- 3.122.6 – Git merge – One conflict – Second PR0 Questions
- 3.132.7 – Git merge – One conflict – Resolution Intro
- 3.142.7 – Git merge – One conflict – Resolution Intro0 Questions
- 3.152.8 – Git merge – One conflict – Resolution
- 3.162.8 – Git merge – One conflict – Resolution4 Questions
- III - Advanced Conflict Resolution with Rebase14
- 4.13.1 – Git Rebase – One conflict – Intro
- 4.23.1 – Git Rebase – One conflict – Intro4 Questions
- 4.33.2 – Git rebase – One conflict – First PR
- 4.43.2 – Git rebase – One conflict – First PR4 Questions
- 4.53.3 – Git rebase – One conflict – Second PR
- 4.63.3 – Git rebase – One conflict – Second PR4 Questions
- 4.73.4 – Git rebase – One conflict – Resolution – Introduction
- 4.83.4 – Git rebase – One conflict – Resolution – Introduction4 Questions
- 4.93.5 – Git rebase – One conflict – Resolution
- 4.103.5 – Git rebase – One conflict – Resolution4 Questions
- 4.113.6 – Git rebase – Many conflicts – Create conflicts
- 4.123.6 – Git rebase – Many conflicts – Create conflicts3 Questions
- 4.133.7 – Git rebase – Many conflicts – Resolution
- 4.143.7 – Git rebase – Many conflicts – Resolution4 Questions
- IV [Bonus] - Alternative to rebase and merge with checkout2
FAQs
The content of this course will be available for a lifetime once you purchase it.
Yes, you can join our Discord server here: https://discord.gg/VZM8BfRv
Yes, you can request a refund by sending me a message. You have up to 3 weeks after your purchase to do so.
You’re welcome to check out my LinkedIn profile to see my recommendations.
You will receive those updates for free.
Yes, you will get a certificate of completion and one recommandation on LinkedIn.
Instructor
Alexandre Blanchet
Early in my career, I specialized in the Python language. Python has been a constant in my professional life for over 10 years now. In 2018, I moved to London where I worked at companies of various sizes as a Python developer for five years. In parallel, I developed my activity as a Mentor, to which I now dedicate myself full-time.
Featured Review
"During many years, I was struggling with merge conflicts. Thanks Alex! This course helped me a lot!"
Featured Review
"During many years, I was struggling with merge conflicts. Thanks Alex! This course helped me a lot!"