In this chapter, you will learn practical Git merging techniques for managing complex data engineering projects. You'll explore different merge strategies and understand how to integrate code changes while maintaining a clean project history. By the end, you'll know how to handle various merge scenarios and reorganize commit histories.

Understanding Merge Types

Force fast-forward merge

Recursive merge

Fast-forward versus recursive

Complex Merge Scenarios

Squash merge

Octopus merge

Advanced Branch Integration: Git Rebasing

Rebase versus merge

Interactive rebase

Rebase

Advanced Merging Strategies

In this chapter, you will develop skills for investigating and managing your project's Git history. You'll learn techniques for selectively applying changes, identifying and fixing bugs, and managing sensitive information in your repository. These tools will help you maintain clean, traceable code in data engineering workflows.

Cherry-Picking

Cherry-Pick single commit

Handling cherry-pick abort

Bisect

Bisect Initialization

Bisect Search

Git Filter Repo

Filtering sensitive data

Remove secrets file from repo

Git reflog

Finding deleted branches

Undoing a commit

Lost commit

Git History and Exploration

In this chapter, you will explore advanced Git techniques for managing complex software projects. You'll learn how to work on multiple features simultaneously, organize code dependencies, handle large files, and implement efficient development workflows. These skills are essential for managing modern data engineering and software development projects.

Git Worktrees

Create a worktree

Remove a worktree

Git Submodules

Adding a Git submodule

Show all submodules

Git Large File Storage

Setting Up Git LFS

Identifying Git LFS File Storage

Trunk Based Development

Principles of Trunk Based Development

Trunk Based Development Workflow

ETL Repository Management

Wrap-up

Advanced Repository Management

This course dives deep into Git's advanced features and is geared toward data engineering and data science workflows. You'll master complex merging strategies, learn to manipulate repository history and optimize Git for large-scale data projects. Key topics include advanced rebasing, git reflog for disaster recovery, efficient debugging with git bisect, and managing large files with Git LFS. You'll also explore parallel development using worktrees and how to modularize project structures with submodules. By the end of this course, you'll have the skills to handle complex version control scenarios and issues in data pipeline development and collaborative data projects.

Intermediate Git

Master Git’s advanced features to streamline data science and engineering workflows, from complex merging to large-scale project optimization.

Advanced Git

Git Fundamentals

Bisect Initialization

Advanced Git

Hands-on interactive exercise