Git version 2.56.0 has been released, bringing two notable features to its core workflow: an improved, safer method for resolving merge conflicts and a new command for editing repository history. The update, detailed in a recent report by LWN.net, is the product of a large community effort, incorporating 748 non-merge commits from 104 developers, with 39 being first-time contributors.
Released since Git 2.55 in June, the update targets both performance and the day-to-day experience of developers using the version control system.
Safer Conflict Resolution Workflow
A key enhancement provides a safer workflow for handling merge conflicts. The new system improves how Git tracks the state of a merge, giving developers greater confidence when editing conflicting files and testing resolutions. This directly addresses a common source of errors in collaborative development, aiming to reduce the risk of botched merges.
Introducing git history drop
The release also introduces the git history drop sub-command. According to the source, this is a new tool to remove a commit, with its descendants replayed onto its parent. It provides a built-in method for commit-level history editing, a task that previously often required external tools or complex manual rewriting.
Under-the-Hood Improvements
The release also includes performance optimizations for "path-walk" repacking, enhancing efficiency for repositories with specific directory structures. Numerous smaller bug fixes and enhancements round out the update.
The safer conflict resolution and new history editing capability address core aspects of development workflows. The full release notes and contributor list are available via LWN.net. Developers are encouraged to upgrade for these new stability and feature improvements.
Git 2.56.0 版本已正式發佈，為其核心工作流程帶來兩項顯著功能：一個改良且更安全的合併衝突解決方法，以及一個用於編輯儲存庫歷史的新指令。據 LWN.net 近期報導所述，此次更新源自龐大的社群協作成果，共整合了 104 位開發者的 748 個非合併提交（commit），其中包含 39 位首次貢獻者。
自今年六月的 Git 2.55 版本以來，此次更新同時著重於效能優化與提升使用版本控制系統的開發者日常體驗。
更安全的合併衝突解決工作流程
一項關鍵增強功能提供了更安全的工作流程來處理合併衝突。新機制改善了 Git 追蹤合併狀態的方式，讓開發者在編輯衝突檔案與測試解決方案時更具信心。此舉直接解決了協作開發中常見的一個錯誤來源，旨在減少搞砸合併的風險。
引入 git history drop 指令
此次發佈亦引入了 git history drop 子指令。根據資料，這是一個用於移除一個提交，並將其後代重新應用到其父提交的新工具。它為提交層級的歷史編輯提供了內建方法，這項工作以往通常需要借助外部工具或複雜的手動重寫。
底層技術改進
本次發佈亦包含針對「路徑遍歷」（path-walk）重組包（repacking）的效能優化，提升了特定目錄結構儲存庫的運作效率。大量較小型的錯誤修正與功能增強亦完善了此次更新。
更安全的合併衝突解決方案與新的歷史編輯能力，解決了開發工作流程的核心面向。完整的發佈說明與貢獻者名單可透過 LWN.net 查閱。鼓勵開發者升級以獲取這些新的穩定性與功能改進。