- FAQ
- I think I found a bug in TortoiseSVN!
- Installation & Upgrade
- Overlay icons
- Authentication
- Daily Use
- 100% CPU, when I right-click on a file
- After I resolve a conflict, the overlay shows 'unmodified'
- Can I create a repository on a network directory?
- Can I define my own keyboard shortcuts to specific commands?
- Can I get a list of all the repositories on my Server?
- Can I use different Subversion clients with the same working copy?
- Can I work on lots of working copies from different repositories at once?
- Can TortoiseSVN convert line breaks in text files on the fly?
- How Can I ...
- How do I find out what the conflict is when it is in a directory's property list?
- How does TortoiseSVN handle conflicts?
- I accidentally removed a file. How do I get it back?
- I always get an error when I check out or export a single file
- I deleted a file and created a file with the same name. Why can't I commit?
- I don't have a 'Subversion' tab for setting properties
- I get multiple TortoiseSVN context menu entries when I right click on a link!
- I have changed the configuration file to match my proxy/etc. setup, why doesn't it work?
- If my connection drops during a checkout, do I have to start again?
- Is it possible to use 'Shared Files' like in VSS?
- Is it possible to use TortoiseSVN without a server?
- Is there a way to send username & password when using TortoiseProc?
- Merge 'From:' revision is out by one when I use Show Log
- Permission control for read and write operations
- Revision graph
- There's no 'author' shown in the logs when I commit changes via svn+ssh.
- TortoiseSVN does not recognize a file as modified!
- TortoiseSVN doesn't work with VS.NET web projects!
- TortoiseSVN seems very slow on big directories
- When I remove a file it vanishes, how do I commit it?
- Where can I view/edit the list of ignored files for each directory?
- Why is SVN checkout so much slower than CVS?
- Feature Requests
- Known problems on Vista
- Other Tools
- SSH / SSL
- Error Messages
- Why do comments sometimes get deleted from this website?
- Why did you name it TortoiseSVN?
- I love TortoiseSVN, how can I help?
How does TortoiseSVN handle conflicts?
Imagine you check out revision 24 of a file and started editing it. In the meantime, someone else committed revision 25, and shortly after that revision 26. You tell TortoiseSVN to update your file now, and Subversion will try to incorporate all the changes between revision 24 and 26 into your local file.
But if the changes made between 24 and 26 were too close to or even overlap with the changes you have made, Subversion detects a conflict and creates conflict markers in the file. You then have to resolve these conflicts yourself. Read the section about conflicts in the
Daily Use Guide to find out more.
google search
Open Source
|
|
|