Geek asks and answers

SVN Collaboration Failure

Today is the first day I play with SVN. However, 1 situation, I can not solve:

I check for 2 pcs. The first PC Pc changes something in the file and commits. Then the second computer tries to fix:

Commit failed (details follow):
File '/classes/ghjs.html' is out of date

I need to run the update on a second computer, it will receive a new file from PC 1, after which I can fix it correctly again, however, the changes made before the update will be lost.

SVN is not so scary if you need to commit / update before you can write a line of code. Other people working in the same file do not have the latest version.

I understand that there is no sense for a "live" collaboration, but there must be something that if you were working on an old version, instead of updating, you can manually "transfer" your changes to the latest version.

Im uses "versions" as svn client and textwrangler as editor for editing php code.

+3
source share
3 answers

I need to start the update on a second PC, it receives a new file from pc 1, then I can commit again, the changes made before the update are lost .

, . ( ), , . , , .

, - - , .

+5

2 svn update. , pc1 . , , , . .

0

" 2", 1 2. 2, , , .

This is done so that SVN takes place to merge the two changes. Merges are performed on a working copy, not on the server.

If your changes from PC2 are lost during the upgrade and merge errors are not displayed, this can really be a problem.

0
source

More articles:


All Articles