Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
Suppose I have a local file that I am working on that is part of a repository. The local file has changes that are local and have been saved to the local file and have yet to be committed.
What happens when I go to update the whole repository?
Is it the case that SVN will try and merge the HEAD with the local copy (hopefully sans conflicts) or will SVN just leave the local copy alone until it is committed later?
It will merge HEAD with your local copy. If the changes collide – you get a nice conflict.