Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

"pull failed: checkout conflict" #112

Open
kousu opened this issue Feb 5, 2015 · 1 comment
Open

"pull failed: checkout conflict" #112

kousu opened this issue Feb 5, 2015 · 1 comment

Comments

@kousu
Copy link

kousu commented Feb 5, 2015

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
Copy link
Author

kousu commented Feb 5, 2015

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@kousu