mergin/cli.py
def resolve_unfinished_pull(ctx):
    """Try to resolve unfinished pull."""
    mc = ctx.obj["client"]
    if mc is None:
        return

    try:
        mc.resolve_unfinished_pull(os.getcwd())
        click.echo("Unfinished pull successfully resolved")
    except InvalidProject as e:
        click.secho("Invalid project directory ({})".format(str(e)), fg="red")
    except ClientError as e:
        click.secho("Error: " + str(e), fg="red")
    except Exception as e:
        _print_unhandled_exception()
Try to resolve unfinished pull.
Try to resolve unfinished pull.
Try to resolve unfinished pull .
def resolve_unfinished_pull(ctx):
    mc = ctx.obj["client"]
    if mc is None:
        return
    try:
        mc.resolve_unfinished_pull(os.getcwd())
        click.echo("Unfinished pull successfully resolved")
    except InvalidProject as e:
        click.secho("Invalid project directory ({})".format(str(e)), fg="red")
    except ClientError as e:
        click.secho("Error: " + str(e), fg="red")
    except Exception as e:
        _print_unhandled_exception()
def resolve_unfinished_pull ( ctx ) : mc = ctx . obj [ "client" ] if mc is None : return try : mc . resolve_unfinished_pull ( os . getcwd ( ) ) click . echo ( "Unfinished pull successfully resolved" ) except InvalidProject as e : click . secho ( "Invalid project directory ({})" . format ( str ( e ) ) , fg = "red" ) except ClientError as e : click . secho ( "Error: " + str ( e ) , fg = "red" ) except Exception as e : _print_unhandled_exception ( )
Try to resolve unfinished pull.
Try to resolve unfinished pull .
"""Try to resolve unfinished pull."""
ctx