Welcome to the CSC Q&A.
Get help and give help!
Write great code!
It is our choices... that show what we truly are, far more than our abilities.


+3 votes

When trying to pull from my copy of the project, I get this error in eclipse:

Pulling 1 repository
Checkout conflict with files:
Checkpoint 1/.classpath
Checkout conflict with files:
Checkpoint 1/.classpath

I think this has something to do with the jar files, or build path somehow? So if anyone knows what this error means I would appreciate it.

asked in CSC305 Fall 2021 by (2.7k points)

had the same problem, I deleted the eclipse file (permanently from disk) and re-cloned it, it works. There might be a better solution tho.

2 Answers

+2 votes

When you want to pull changes from remote your status should be clear, which means there is no local changes you've made. You can either discard them, commit, or stash them to proceed

answered by (2.2k points)
+2 votes

We had the same problem. We deleted and re-added the repository.

answered by (2.1k points)