Skip to content

"pull failed: checkout conflict" #112

Description

@kousu

I have Agit 1.38 from F-Droid installed. I have repos pulled over ssh. If I make changes and then repull sometimes it works, but with some repos it gives me this error:
"Pull failed"
"Checkout conflict with files: $FILENAME"

Sometimes a repo can repull fine and then stop repulling. I haven't yet worked out what's the difference is.

I am emailing you my adb bugreport.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions