This guide explains how to use Git's built‑in worktree feature combined with a bare repository to check out multiple branches simultaneously, keeping a tidy project layout, reducing context‑switch overhead, and improving IDE friendliness for hot‑fixes, features, and maintenance work.
GitButler, an open‑source Git client built with Tauri, Rust, and Svelte, lets users organize multiple branches, drag‑and‑drop commits, integrate with GitHub, manage SSH keys, and leverage AI‑generated messages, with detailed usage guidance and screenshots for macOS and Linux users.
This article explains how to organize Git branches for normal and parallel multi‑version development, compares merge and rebase workflows, and offers practical tips to keep version control clean and avoid risky merge mistakes.
This article provides a thorough tutorial on Git, covering environment installation, core concepts, common commands for adding, committing, and checking status, branch creation and merging, file operations, diff and log viewing, remote repository handling, SSH key setup, multi‑person collaboration workflow, remote branch management, force pushes, and merge strategies with conflict resolution.
This article explains how to use git stash to temporarily save uncommitted changes for safe branch switching and how to apply git cherry-pick to selectively transfer commits, helping developers avoid merge conflicts and keep their codebase clean.
This guide walks you through essential Git operations—including pushing a local project to a remote repository, reverting to previous commits, changing remote URLs, renaming and deleting branches, copying master to a new branch, and migrating repositories while preserving history.
This guide explains how to undo unwanted commits both locally and on a remote Git repository using IntelliJ IDEA, covering simple manual comparison, the IDE's reset options, and force‑push to synchronize the cleaned history.
This article explains how Git worktree lets developers maintain a single repository while simultaneously working on multiple branches—such as features, hotfixes, or testing environments—without the overhead of cloning multiple repos, and provides practical commands and examples for effective workflow management.
Effective Git branch management combines versatile checkout commands with strategic merges—using git merge for full history integration, git rebase to reposition commits, temporary branches for selective merges, cherry-pick for individual changes, and checkout --patch for interactive, file-by-file control.
This article presents a comprehensive guide to using Subversion (SVN) for multi‑branch version control, covering branch management, daily development cycles, hot‑fix procedures, conflict resolution, and step‑by‑step setup and merge operations to streamline development and testing workflows.
This article explains how Git worktree, a feature introduced in 2015, allows developers to maintain a single repository while working on multiple branches simultaneously, addressing common scenarios such as hot‑fixes, feature development, and environment switching, and provides practical commands and examples.
This guide explains why traditional stash or multiple‑repo cloning fall short, introduces Git's worktree feature, and walks through adding, listing, removing, and pruning worktrees so developers can handle hotfixes and features in parallel without disrupting their main workflow.
Git worktree, a little‑known feature introduced in 2015, lets developers maintain a single repository while simultaneously working on multiple branches—such as feature and hotfix—without costly context switches, large repo clones, or environment reconfiguration, and includes commands for adding, listing, removing, and pruning worktrees.
This article provides a comprehensive guide to Git, covering its purpose, installation on Windows, Linux, and macOS, account registration, SSH key setup, creating repositories, cloning, branch management, merging, conflict resolution, and version rollback procedures.
This article describes how Ctrip's flight front‑end team adopted GitLab Flow and the Light Merge branch strategy—detailing the evolution from single‑branch to multi‑branch approaches, the mechanics and advantages of Light Merge, and the automation of CI/CD, code review, and branch lifecycle management to achieve fast, reliable releases.
This article outlines best practices for Git branch management—including naming conventions for master, develop, feature, release, and hotfix branches—and provides detailed commit message guidelines based on the Angular style, complete with example commands and formatting rules to improve workflow and code traceability.
This comprehensive guide covers Git fundamentals, including workspace concepts, configuration, common commands, branch management, merging strategies, hooks, and troubleshooting tips, providing developers with a complete reference to efficiently use Git for version control in any project.
This article describes how the Beetle platform, together with the LuBan system, automates multi‑branch creation, testing, gray release, and hot‑fix processes for app development, addressing challenges of branch‑demand association, merge coordination, and version synchronization to improve delivery speed and quality.
Git 2.23 splits the overloaded git checkout command into two focused commands—git switch for branch operations and git restore for file recovery—making version‑control workflows clearer and reducing confusion for new users.
This comprehensive guide walks developers through installing Sourcetree, adding repositories, visualizing branches, performing fetch, pull, commit, stash, merge, tag, and other Git operations with step‑by‑step screenshots and command examples, helping them master cross‑platform Git workflow without IDE constraints.
This guide explains how to adopt disciplined Git habits, use Git Flow branch models, configure SourceTree and GitLab, and follow a structured development process that covers committing, rebasing, merging, testing, releasing, and hot‑fixing for smooth team collaboration.
This guide explains how to adopt solid Git habits, write meaningful commits, use interactive rebase, configure push and pull behavior, choose between merge and rebase, apply the Git Flow branching model, and set up SourceTree and GitLab for smooth team collaboration.
Meituan’s client team solved the complexity of weekly transportation‑app releases by discarding the long‑lived develop branch, creating per‑week Release branches from a continuously integrated Stage branch, and automating multi‑repo branch creation, synchronization checks, and bulk merges with Jenkins, enabling fast, reliable deployments across 16 repositories.
This article analyzes the challenges of dual‑mode (waterfall + agile) software development in traditional enterprises and proposes a full‑scenario Git branch management model—including Master, Dev, Test, feature, release and hot‑fix branches—while also announcing a DevOps+LIVE technical livestream about the 2018 Global DevOps State of the Union report.
This guide provides a comprehensive overview of essential Git commands for pulling, committing, branching, merging, tagging, stashing, and managing files, along with practical tips and conventions to streamline collaborative development workflows.
This article explains Alibaba’s AoneFlow branch management method, comparing it with TrunkBased, GitFlow, and GithubFlow, detailing its three core rules, automation tools, and how it balances continuous integration with feature-driven development for efficient, scalable software delivery.
The article explains Baidu's traditional project branch management approach, the reasons behind mainline release queues, and summarizes the team's continuous delivery transformation, highlighting clear goals, transparent planning, self‑defined processes, story‑driven development, six‑step CI, and automated testing practices.
This article explains why teams should adopt Git, outlines its key advantages, discusses common version‑control challenges, and provides a detailed walkthrough of the Git Flow branching model—including production, develop, feature, release, and hotfix branches—plus practical command‑line examples and tool recommendations.
