svn_client_conflict_tree_resolve

subversion_sys

Function svn_client_conflict_tree_resolve 

Source 
pub unsafe extern "C" fn svn_client_conflict_tree_resolve(
    conflict: *mut svn_client_conflict_t,
    option: *mut svn_client_conflict_option_t,
    ctx: *mut svn_client_ctx_t,
    scratch_pool: *mut apr_pool_t,
) -> *mut svn_error_t
Expand description

Resolve a tree @a conflict using resolution option @a option.

May raise an error in case the tree conflict cannot be resolved yet, for instance @c SVN_ERR_WC_OBSTRUCTED_UPDATE, @c SVN_ERR_WC_FOUND_CONFLICT, or @c SVN_ERR_WC_CONFLICT_RESOLVER_FAILUE. This may happen when other tree conflicts, or unversioned obstructions, block the resolution of this tree conflict. In such a case the other conflicts should be resolved first and resolution of this conflict should be attempted again later.

@since New in 1.10.