agit icon indicating copy to clipboard operation
agit copied to clipboard

Published 20 hours ago • verified publisher icon rtyley

"pull failed: checkout conflict"

Open kousu opened this issue 9 years ago • 1 comments

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.

kousu avatar Feb 05 '15 18:02 kousu

...actually I can't find an email for you. How would you like to receive this file, Roberto?

kousu avatar Feb 05 '15 19:02 kousu