Incremental merge for git