Native Merging and Conflict Resolving in RemObjects GitBrowser
blogs.remobjects.com