---

KernelTrap: Git 0.99.7 Released, Looking Ahead

“Git 0.99.7 was released by git maintainer Junio Hamano,
including several bug fixes and a few new features including
enhanced merging. ‘People found interesting cases where the
‘stupid’ three-way merge mechanism does the wrong thing without
noticing,’ Junio noted. ‘We have two new merge algorithms by Daniel
and Fredrik that attempt to do better in such cases.’ The release
announcement was followed by a todo list laying a roadmap for
future git development, and an eventual 1.0 release…”

Complete Story