Overview

This course features Coursera Coach! A smarter way to learn with interactive, real-time conversations that help you test your knowledge, challenge assumptions, and deepen your understanding as you progress through the course. Build a solid foundation in Git and GitHub with this hands-on course that takes you beyond the basics. You'll gain practical experience managing branches, undoing changes, configuring tools, and collaborating securely via SSH—all essential for effective software development workflows. You’ll begin by mastering Git branching and learning to undo changes confidently using checkout, revert, and reset. Next, the course introduces best practices for syncing with GitHub, including pushing and pulling commits and establishing secure SSH connections. You'll also explore configuring Git with custom Bash prompts and default editors. As the course progresses, you’ll install and configure diff and merge tools like p4merge, learning how to compare changes across various stages and branches. Finally, a deep dive into advanced commands like cherry-picking, merging, and resolving conflicts equips you with expert-level Git skills. This course is ideal for developers, DevOps professionals, and technical teams working in collaborative environments. A basic understanding of Git is required. The course is best suited for learners at the intermediate level.

Syllabus

Git Branching Basics

In this module, we will explore the fundamental concepts of Git branching. You'll learn how to create, switch, and manage branches effectively in a hands-on lab environment. This foundation sets the stage for more advanced workflows in collaborative development.

Undoing Changes in a Git Repository

In this module, we will work through techniques for undoing changes in Git, from checking out past commits and individual files to using revert and the three types of reset. You'll also learn how to clean your working directory to keep your repository organized.

Pushing into GitHub

In this module, we will walk through the essential process of pushing and pulling changes between your local Git setup and GitHub. You'll gain confidence in managing contributions in a shared development environment.

GitHub through Secure Shell (SSH)

In this module, we will establish secure communication between your system and GitHub using SSH. From key generation to managing connections and passphrases, you'll ensure your workflows are both efficient and secure.

Custom Bash prompt in Git

In this module, we will customize the Bash prompt to reflect your Git environment, such as the current branch and status. This visual enhancement improves efficiency and awareness during development.

Installing and Configuring Default Text Editor for Git

In this module, we will explore how to configure a preferred text editor for Git. You'll set up Sublime Text on Windows, Linux, and Mac to streamline editing commit messages and conflict resolution files.

Installing and Configuring Diff and Merge Tool for Git Repository

In this module, we will install and set up p4merge as a diff and merge tool for Git on Windows, Linux, and Mac. You'll learn how to integrate this tool into your workflow to simplify code comparisons and conflict resolution.

Git Comparison with Git Diff Tool (p4merge)

In this module, we will explore how to use p4merge for comparing changes within Git. You’ll visually inspect modifications across different areas—working directory, staging, commit history, and remotes—improving code review and debugging.

Deep Dive into Few Git Commands

In this module, we will take a closer look at powerful Git commands like git log and git remote. You’ll gain skills to navigate commit history and manage repository remotes effectively.

Git Branching and Merging Techniques

In this module, we will master the art of merging in Git, from branch deletions to conflict resolution. You’ll also explore cherry-picking techniques for selective commit application, equipping you for complex branching scenarios.