[This is preliminary documentation and is subject to change.]
[Missing <summary> documentation for T:SharpSvn.SvnAccept]
Assembly: SharpSvn (in SharpSvn.dll) Version: 1.4999.582.31705
Syntax
| C# |
|---|
public enum SvnAccept |
| Visual Basic (Declaration) |
|---|
Public Enumeration SvnAccept |
| Visual C++ |
|---|
public enum class SvnAccept |
Members
| Member name | Description | |
|---|---|---|
| Base | Choose the base file | |
| Merged | Choose the 'merged file'. The result file of the automatic merging; possibly with local edits | |
| Mine | Choose local version on all conflicts; further use auto-merged | |
| Theirs | Choose their on all conflicts; further use auto-merged | |
| MineFull | Choose the local file | |
| TheirsFull | Choose the incoming file | |
| Postpone | Don't resolve the conflict now. Let subversion mark the path
'conflicted', so user can run 'svn resolved' later |
