I am working on a PHP project in Netbeans, using subversion for version control. I have made local changes to a file and saved without committing. My coworker made changes and commitments to the file later today. When I update the file, it leaves my current file intact, but when I go to history it shows the latest version of the file-- my coworker's edits-- and I can diff to it and see many changes.

Why hasn't the update completely replaced the local edits I made? Am I missing something, or is that the default behavior of subversion? If I run an update, I would expect to have the updated file, not a file which includes my uncommitted edits.

I'm new to subversion, thanks for the help.

有帮助吗?

解决方案

You have to tell subversion to overwrite your local changes. Overwrite and Update in Eclipse.

许可以下: CC-BY-SA归因
不隶属于 StackOverflow
scroll top