The article explains that merge conflicts themselves are harmless, but chaotic merging practices cause trouble, and it walks through how Git detects conflicts, what the conflict markers mean, and practical habits like frequent pulls, short‑lived feature branches, clear naming, and careful diff review to avoid them.
This article explains comprehensive Git workflow, branch naming conventions, commit message standards, and supporting tools such as validate-branch-name, Husky, Commitizen, and Commitlint, providing practical examples and configuration snippets to help development teams maintain a clean and efficient version‑control process.
The article introduces the Chinese version of the Conventional Branch Naming Specification, explains its purpose, outlines branch prefixes and naming rules, provides examples, and lists tools for automatic compliance, offering a comprehensive guide for improving Git workflow readability and automation.
The Conventional Branch Specification project introduces a structured, standardized naming convention for Git branches, detailing prefixes like feature/, bugfix/, hotfix/, release/ and chore/, explaining their purposes, benefits for team collaboration, CI/CD integration, and providing usage examples and FAQs.
This guide explains product and engineering versioning, release tagging, branch naming conventions, and a step‑by‑step GitHub Flow workflow—including CI/CD, automated testing, and deployment practices—to help teams standardize release management and improve development efficiency.
This guide explains how to structure Git branches—including master, develop, feature, release, and hotfix—provides command sequences for common tasks, and details a comprehensive commit‑message format based on the Angular convention to improve code review, release notes, and long‑term maintainability.
The article explains the importance of establishing Git commit message and branch naming standards, demonstrates the benefits of structured conventions, provides concrete examples and regex patterns, and shows how to enforce them with Git hooks such as Bitbucket's Yet Another Commit Checker.
GitHub announced that starting October 1 new repositories will default to the "main" branch instead of "master", a change driven by social concerns and industry-wide efforts to replace terminology perceived as discriminatory, with many other tech companies following suit.
