xCode TFS git Reposity - not able to pull changes when uncommited changes

Question

I have created remote repository on TFS server and successfully able to push and pull changes to/from server but able to checkout only by one user at a time.

So, while more than one user, when i need to take updates(pull changes), i have to discard my current changes. (Getting error - The working copy "" has uncommitted changes)

Also, i have tried solution : - .gitignore - rm cached

Can anybody please assist!

Thanks

Answer 1

There is no way to do a PULL when you have uncommitted local changes. You need to deal with them first.

1. Commit them - If you commit the changes locally you can PULL and merge the incoming changes with the local ones.
2. Branch and Commit - If you create a branch and checkout it immediately your uncommitted changes will be poured across and you can commit there.
3. Undo - You can undo the local changes and then PULL, however you just lost hose changes.
4. Copy - You can manually copy the changes out of the Git repo, and then back in after.

I would recommend either #1 or #2 as the only realistic options.