2

I am just starting a new position and using svn rather than git (my favorite).

With svn if there are any conflicts will I see them after an svn update or after an (attempt) to svn commit?

In other words will an svn update merge remote changes into my current (uncommited) working copy?

I want to be sure not to mess up before my first svn commit if things are not good as I am new to this system! :)

Obviously I have also made a manual copy of my new code in case I run into any issues :)

fyi, I am on Ubuntu 11.10

Michael Durrant
  • 13,399

1 Answers1

6

In other words will an svn update merge remote changes into my current (uncommited) working copy?

Yes.

svn will not let you commit if there are new changes in the repository; you will have to do an update first. This update will merge remote changes into your current working copy and alert you of any merge conflicts that occurred.

Heinzi
  • 9,868