![create branch smartsvn create branch smartsvn](https://i.ppfocus.com/2020/9/60e0a507ea.jpg)
SVN status command will display all the files in the current directory.
#Create branch smartsvn how to
This article explains everything that you need to know about how to manage locks on files in your SVN repository. Even svn will not allow them to commit their changes in normal way. So as soon as you are taking an update, if you are getting a svn lock on it, you can make others aware that you are modifying so please don’t commit any changes from your side. If you have locked a file, it cannot be modified by any other users straight away. someone is modifying it, so please wait for that person to commit it first. It flags different users collaborating with each other by stating that the current file is in locked state. This file is being frequently modified by different people in your team and here you can’t manually resolve the conflict like you did with the text files. Now, what if the same situation occurs when you are trying to commit a binary file (for example, a image file). SVN merge by itself is a detailed topic, which we explained earlier by providing several examples on how to merge svn branch and trunk. If the updates are done on the same line, then you can probably manually resolve the conflict by comparing both the files.
#Create branch smartsvn update
If it is a text file (scripting file, programming language file, readme file, etc.), you can take an update and probably still can commit without any conflict as your changes will be merged automatically to the latest file that is present in the repository. Someone has updated the file after you took the latest update from the repository. This means that your working copy is not the latest one when compared to the copy that was already present in the repository.
![create branch smartsvn create branch smartsvn](http://www.cogitosoft.com/f/image/20171012/20171012105631_4490.jpg)
Sometimes when you try to commit a file to SVN repository, you might get a conflict message.