AMAPstudio

User Tools


Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Next revision
Previous revision
Last revision Both sides next revision
common_problems_with_svn [2018/01/22 09:36]
coligny created
common_problems_with_svn [2018/01/22 10:28]
coligny
Line 3: Line 3:
 All the commands below are run from SmartSVN. All the commands below are run from SmartSVN.
  
-**File status is Removed, but commit not possible**+===== File status is Removed, but commit not possible ​===== 
  
 You tried to remove a file from svn and commit is not possible. You tried to remove a file from svn and commit is not possible.
Line 9: Line 10:
 Check if you did SVN Remove on the directory in the Files lateral panel. If so, the SVN Commit must also be done directly on the directory (and not at the file level). Check if you did SVN Remove on the directory in the Files lateral panel. If so, the SVN Commit must also be done directly on the directory (and not at the file level).
  
-Removed, ​ 
  
-An error... commit failed , file is out of date+===== Phantom (Tree conflict) =====
  
 +May happen when a local remove has been processed and someone else removed / commited the file on svn.
  
 +Select file and choose Mark resolved, option 1 (not '​accept incoming delete'​)
 +
 +
 +===== Removed (Tree conflict) =====
 +
 +Revert will cancel your local action (remove, delete, move...) and may solve the problem.
 +
 +
 +===== Removed (Tree conflict: local file delete, incoming edit upon update) =====
 +
 +Revert will cancel your local removing order and accept the commited modification by the other user, the file will become Unchanged locally.
  
-**Phantom (Tree conflict)** 
  
-May happen when a local remove has been processed and someone else removed / commited the file on svn. 
  
-select file and choose Mark resolved 
common_problems_with_svn.txt · Last modified: 2018/01/22 10:33 by coligny