First, rewinding head to replay your work on top of it...
Applying: Add filters for latest visit status
Using index info to reconstruct a base tree...
M	swh/graphql/backends/archive.py
M	swh/graphql/errors/__init__.py
M	swh/graphql/errors/errors.py
M	swh/graphql/resolvers/resolvers.py
M	swh/graphql/resolvers/visit_status.py
M	swh/graphql/schema/schema.graphql
M	swh/graphql/tests/functional/test_visit_node.py
M	swh/graphql/tests/functional/test_visit_status.py
Falling back to patching base and 3-way merge...
Auto-merging swh/graphql/tests/functional/test_visit_node.py
CONFLICT (content): Merge conflict in swh/graphql/tests/functional/test_visit_node.py
Auto-merging swh/graphql/schema/schema.graphql
CONFLICT (content): Merge conflict in swh/graphql/schema/schema.graphql
Auto-merging swh/graphql/resolvers/resolvers.py
Patch failed at 0001 Add filters for latest visit status

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Already up to date.

commit c1aa68d6dc9c5f4f409cfa4885e9323b82981dfb
Merge: 32d5564 77b91d6
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 15:42:06 2022 +0200

    Refactor resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    to return None instead of objects.

commit 77b91d6f4773bc75795a6e55d77762d045208b14
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    resolver re-factoring

commit 01343d4509bda4d30141078db5287c03e52e58fb
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 11:36:00 2022 +0200

    Add filters for latest visit status
    
    Possibility to filter a latest vist status by status state and
    require snapshot.

Current branch diff-target is up to date.

commit 14417c8900dc3ca7d7d2bb80d4719abbcd151aaa
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    resolver re-factoring

Current branch diff-target is up to date.

commit d760b540bc5d67dfb834adf3f43e109aa8ba746a
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    to return None instead of objects.

Current branch diff-target is up to date.

commit 181120921c9aa4289d9598ee86298e6a867a1d1a
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    to return None instead of objects.

Current branch diff-target is up to date.

commit 9a7cd432ade0d396bcc8796444a5cd8dd206c79f
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    to return None instead of objects.

Current branch diff-target is up to date.

commit 91c0de176e0cf623198255160a2ce356918a82ba
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    return None instead of an object.

Current branch diff-target is up to date.

commit 82fe7599e7b14ac32ab340dc3606298b0d58b1f9
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    return None instead of an object.

Current branch diff-target is up to date.

commit 2a495c8970300f9906584968b9b557626223f2fe
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node and connection resolver bindings
    
    Use a factory class to create node and connection objects. Bind them to
    schema in the resolvers module.
    raise NullableObjectError in the node resolvers to return None instead
    of an object.
    
    Refactor connection resolver factory

Current branch diff-target is up to date.

commit 4b20ef58f24629812d62bef472b132d74ab78827
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node and connection resolver bindings
    
    Use a factory class to create node and connection objects. Bind them to
    schema in the resolvers module.
    raise NullableObjectError in the node resolvers to return None instead
    of an object.

Current branch diff-target is up to date.

commit e60916c0edcf369335bacd4adfd107b183dc53c5
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node and connection resolver bindings
    
    Use a factory class to create node and connection objects. Bind them to
    schema in the resolvers module.
    raise NullableObjectError in the node resolvers to return None instead
    of an object.

Current branch diff-target is up to date.

commit ffb88715d7b485a5dc726ed6ce517320324eb426
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node and connection resolver bindings
    
    Use a factory class to create node and connection objects. Bind them to
    schema in the resolvers module.
    raise NullableObjectError in the node resolvers to return None instead
    of an object.