Subversion 1.7 Released with Some Git-esque Merging

“Going forward, work is in progress on something known as the
newmerge that is more like the Git model of merging code. Newmerge
will provide a client-side code merge into an SVN repository.

“The biggest complaint associated with Subversion is associated
with branching and merging,” Richards said. “The one feature that
Git has that our users would really like is a really fast and
simple merge.”

Complete Story