CoursesAI WorkshopCompaniesPricingBlogNewsletter
  • Courses
  • AI Workshop
  • Companies
  • Pricing
  • Blog
  • Newsletter
Subscribe
  • Courses
  • Companies
  • Communities
  • Blog
  • Gift card
  • Newsletter
  • Help
  • Shop
  • ConfAiBot
  • Contact
  • Legal notice
  • General conditions
  • Privacy policy
  • Cookies policy

Course of Git: Introduction and Team Work

Lite
Rafa GómezJavier Ferrer

By Rafa Gómez y Javier Ferrer – Tooling

Learn to work in a team with Git and make the most of advanced aspects such as debugging, merge strategies, and much more.

Go to course

This course consists of 3 main sections:

  • Introduction to Git
  • Teamwork
  • Advanced aspects

In other words, we will go from 0 to 100 in a very short time so that if you already know the basics of this version control system, the course will still be useful to you 🙂

In this course, you will therefore learn to:

  • Start working with Git for the first time
  • Automate day-to-day tasks thanks to Git aliases and binaries
  • Work in a team with GitHub
  • Team workflows with and without branches
  • Best practices for defining what and how we ignore files, write commit messages, and Pull Request descriptions
  • Pros and cons of different merge strategies
  • Conflict resolution
  • Debugging your application with Git
  • How Git works internally: Git internals

Videos of the course

  • Learn Git in 10 Minutes
  • Beyond working on a branch: Stashes, Branches, Tags, and Revert
  • Let's Review!

  • add vs commit & tips
  • checkout vs branch & tips
  • Let's Review!
  • Practice! Moving between branches

  • fetch vs pull & tips
  • Let's Review!
  • Practice! Sync your repository

  • Extending functionalities with Git aliases
  • Automagic Git binaries
  • Terminal aliases: gc, gps, gpl, ga…
  • Let's Review!
  • Practice! Alias to optimize your work

  • Your first Pull Request on GitHub
  • Team workflow: Labels vs GitHub Project vs PR Status
  • Let's Review!
  • Practice! Create your Pull Request

  • Git Flow: Why we don't like the most known one
  • GitHub Flow: The Open Source model
  • GitLab Flow: Giving importance to environments
  • Release Flow: Microsoft ❤ Git
  • Trunk-Based Development: When names mislead
  • Master-only Flow: The most different one
  • Comparative conclusions on Git Flows
  • Let's Review!
  • Practice! Git Flows in the real world ™

  • How and what to ignore globally
  • Good commit descriptions
  • The Pull Request you would want to review
  • Let's Review!
  • Practice! Get your best PR

  • Merge
  • Rebase
  • Squash
  • Avoiding cluttering history by doing pulls
  • Day by day with GitHub
  • Let's Review!
  • Practice! Integrate your changes

  • Branch and merge configuration in GitHub
  • Git hooks
  • Let's Review!
  • Practice! Creating Hooks

  • How we resolve conflicts in Git
  • Tip for saving time with conflicts and rebase
  • Avoiding conflicts
  • Let's Review!
  • Practice! Resolve a conflict

  • Undoing messes, rollback, and run
  • Detecting why changes X were made
  • Locating when a bug was introduced
  • Let's Review!
  • Practice! Moving commits

  • How to prioritize refactoring efforts
  • Teamwork: Processes over people?
  • Let's Review!
  • Practice! Take aliases to the next level

  • How Git works: Knowing the .git folder
  • How to recover lost commits
  • Let's Review!
  • Practice! Recover a lost commit

  • Day-to-day of Rafa with Git
  • Avoid conflicts with config files

  • Versioning production configuration and secrets
  • Squeeze Git log
  • Fork or clone in corporate environments
  • Git switch vs Git checkout
  • Git worktree: Work on multiple branches independently
  • How we merge PRs: Merge commit vs Squash vs Rebase

  • Conclusion and next steps
  • Course improvement feedback and next steps
Go to course

Related courses

Standard
Dependabot: Keep your repo up to date, securely and automatically

🛡️ Dependabot: Keep your repo up to date, securely and automatically

Javier FerrerRafa Gómez

Update your dependencies safely without PR spam.

See course
Standard
Visual Studio Code: Productivity and Setup

🛠️ Visual Studio Code: Productivity and Setup

Rafa GómezJavier Ferrer

Boost your productivity by making the most of Visual Studio Code. From a minimalist appearance to mastering all its hidden shortcuts.

See course
Standard
Data Processing in Bash: Manage JSON, XML, YAML Files

🎲 Data Processing in Bash: Manage JSON, XML, YAML Files

Javier FerrerRafa Gómez

Bash is the most famous scripting language there is. Learn to leverage its full potential to manage our JSONs, YAMLs…

See course
See full catalogue

Pay according to your needs

lite (only monthly)

19 €
per month
  • Essential programming courses to build a solid foundation
Popular

standard

24,92 €
Discount vs monthly of 49 €
Annual payment of 299 €
per month
  • Main catalog to master writing maintainable, scalable, and testable code
  • Receive job offers verified by Codely
  • Company invoice
  • Accumulate renewal discounts

premium

41,58 €
Discount vs monthly of 89 €
Annual payment of 499 €
per month
  • Exclusive AI courses to keep you always up to date
  • Early access to new courses
  • Discount on workshops
  • Receive job offers verified by Codely
  • Company invoice
  • Accumulate renewal discounts

We won't increase the price while your subscription is active

SubscribeSign in