Git 2.56 released with new conflict resolution features
The open source Git project released version 2.56, introducing tools to make resolving merge conflicts safer. A key addition is 'git add --resolved', which stages only files previously in conflict and checks for unresolved markers before proceeding. Over 100 contributors participated in the update, which also includes improvements to merge base calculation and general bug fixes.
- Git 2.56 released with updates and bug fixes
- Introduces 'git add --resolved' for safer conflict resolution
- Over 100 contributors participated in this release
- Improves calculation of merge bases for merges
Sources covering this
More in Enterprise
Cloudflare launches cf CLI for full API access
Cloudflare just announced cf, a new command-line tool that gives both humans and AI-powered agents access to all of Cloudflare's…
Meta launches Enterprise Platform, hires new enterprise chief
Meta has hired CJ Desai, until now the CEO of MongoDB, to run its new enterprise AI division, Meta Enterprise Platform.
Google Cloud launches Z4D VMs for storage-heavy workloads
Google Cloud has released its new storage-optimized Z4D virtual machines and bare-metal instances to all customers.
Databricks gives 14,000 employees instant access to new AI models
Databricks now provides its 14,000 employees immediate, company-wide access to new frontier AI models as soon as they drop.