Version-Control on Commentary of Takao

Git LFS: Managing Large Files in Your Repository

Tue, 26 Nov 2024 00:00:00 +0900

Introduction

Git was designed for text files, not large binaries. When large files enter a Git repository, clone times increase, repository size balloons, and operations like git log slow down. Git LFS (Large File Storage) solves this by replacing large files with text pointer files in the repository while storing the actual content on a remote server.

A pointer file is a small text file that maps to content on the LFS server:

Git Squash Merge: Clean History Strategies for Teams

Tue, 21 May 2024 00:00:00 +0900

Introduction

Git history is a communication tool for your team and your future self. A clean, readable history makes debugging, code review, and release management significantly easier. Squash merge is one of the primary strategies for maintaining a clean history, but knowing when and how to use it—and when to choose alternatives—requires understanding the trade-offs involved. This article provides a comprehensive guide to squash merge strategies for teams.

Squash Merge Mechanics

A squash merge combines all commits from a feature branch into a single commit on the target branch. Consider a feature branch with commits C, D, and E that need to be merged into main:

Git Submodules: Managing Nested Repositories Effectively

Mon, 22 Jan 2024 00:00:00 +0900

Git submodules allow you to nest one Git repository inside another while maintaining independent version control for each. They are useful for managing shared libraries, third-party dependencies, or configuration collections where you need precise commit-level control. However, submodules come with complexity that requires understanding their underlying mechanics.

Understanding Git Submodules

A submodule is a reference from your parent repository to a specific commit in another repository. Git stores this as a tree object in the parent’s index, and the mapping of submodule paths to repository URLs lives in a .gitmodules file at the root of the parent repository.