Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Merge pull request #1059 from libgit2/ethomson/mergeconflict

Introduce CheckoutConflictException
latest commit ba6b4b47fa
@nulltoken nulltoken authored
..
Failed to load latest commit information.
Core Merge pull request #1059 from libgit2/ethomson/mergeconflict
Properties Make version comply to SemVer
AmbiguousSpecificationException.cs Fix xml doc related warnings
ArchiverBase.cs Add Archive() to ObjectDatabase
BareRepositoryException.cs Fix xml doc related warnings
BlameHunk.cs Upgrade to .Net 4.0
BlameHunkCollection.cs meta fixture ensuring GetEnumerators are testable
BlameOptions.cs Optimize import directives
Blob.cs Fix truncation of Blob.Size
BlobExtensions.cs Drop optional parameters in BlobExtensions.cs
Branch.cs Obsolete ReferenceWrapper.Name in favor of ShortName
BranchCollection.cs Drop optional parameters in BranchCollection.cs
BranchCollectionExtensions.cs Drop optional parameters in BranchCollectionExtensions.cs
BranchTrackingDetails.cs Optimize import directives
BranchUpdater.cs Obsolete ReferenceWrapper.Name in favor of ShortName
BuiltInFeatures.cs Introduce GlobalSettings.Features()
ChangeKind.cs Update binaries to 69db893
CheckoutCallbacks.cs Update Checkout and Merge options
CheckoutConflictException.cs Introduce CheckoutConflictException
CheckoutFileConflictStrategy.cs Optimize import directives
CheckoutModifiers.cs Standardize comments style
CheckoutNotificationOptions.cs Optimize import directives
CheckoutOptions.cs Update Checkout and Merge options
CherryPickOptions.cs Introduce MergeOptionsBase
CherryPickResult.cs Optimize import directives
CloneOptions.cs Teach clone the ability to recurse into submodules
Commit.cs Upgrade to .Net 4.0
CommitFilter.cs Rename CommitFilter.FirstParent to FirstParentOnly
CommitLog.cs Implement git log --follow
CommitOptions.cs Optimize import directives
CommitRewriteInfo.cs Drop optional parameters in CommitRewriteInfo.cs
CommitSortStrategies.cs Standardize comments style
CompareOptions.cs Obsolete CompareOptions.UsePatienceAlgorithm in favor of .Algorithm
Configuration.cs Update libgit2 to ff8d635
ConfigurationEntry.cs Configuration.Testability++
ConfigurationExtensions.cs Drop optional parameters in ConfigurationExtensions.cs
ConfigurationLevel.cs Standardize comments style
Conflict.cs Standardize comments style
ConflictCollection.cs Conflicts: take the Index not the Repository
ContentChangeStats.cs Introduce Diff.Compare<PatchStats>()
ContentChanges.cs Fix issues reported by CodeAnalysis (NRefactory).
Credentials.cs Optimize import directives
CurrentOperation.cs Standardize comments style
CustomDictionary.xml Fix issues raised by Code Analysis
DefaultCredentials.cs Hide GitCredentialType from public API
DescribeOptions.cs Introduce repo.Describe()
DescribeStrategy.cs Introduce repo.Describe()
DetachedHead.cs Standardize comments style
Diff.cs Obsolete CompareOptions.UsePatienceAlgorithm in favor of .Algorithm
DiffAlgorithm.cs Obsolete CompareOptions.UsePatienceAlgorithm in favor of .Algorithm
DiffModifiers.cs Standardize comments style
DiffTargets.cs Standardize comments style
DirectReference.cs Capture Reference instances' repo
EmptyCommitException.cs Fix xml doc related warnings
EntryExistsException.cs Subtransport logic.
ExplicitPathsOptions.cs Marked non-extensible classes as sealed
ExtraDefine.targets Improve tracking toolset of improperly released unmanaged handles
FetchHead.cs Drop obsolete members after release v0.17.0
FetchOptions.cs Optimize import directives
FetchOptionsBase.cs Teach clone the ability to recurse into submodules
FileStatus.cs Give FileStatus enum entries more meaningful names
FilteringOptions.cs Introduce blob FilteringOptions for content stream
FollowFilter.cs Implement git log --follow
GitLink.cs Standardize comments style
GitObject.cs Add IBelongToARepository with some implementations
GitObjectMetadata.cs Optimize import directives
GlobalSettings.cs GlobalSettings.NativeLibraryPath: throw once used
Handlers.cs Teach clone the ability to recurse into submodules
HistoryDivergence.cs Move FindMergeBase() overloads to ObjectDatabase
IBelongToARepository.cs Add IBelongToARepository with some implementations
ICommitLog.cs Standardize comments style
IQueryableCommitLog.cs Implement git log --follow
IRepository.cs Fix a typo in a comment.
Identity.cs Introduce Identity type
Ignore.cs Standardize comments style
Index.cs Conflicts: take the Index not the Repository
IndexEntry.cs Expose the assume-unchanged flag to IndexEntry
IndexNameEntry.cs Introduce Repository.Index.Conflicts.Names
IndexNameEntryCollection.cs Conflicts: take the Index not the Repository
IndexReucEntry.cs Introduce Index.Conflicts.ResolvedConflicts
IndexReucEntryCollection.cs Conflicts: take the Index not the Repository
InvalidSpecificationException.cs Update documentation on InvalidSpecificationException
LibGit2Sharp.csproj Merge pull request #1059 from libgit2/ethomson/mergeconflict
LibGit2Sharp.v2.ncrunchproject Use NativeBinaries package for libgit2 dependency
LibGit2SharpException.cs Optimize import directives
LockedFileException.cs Fix xml doc related warnings
Log.cs Minor cleanups
LogConfiguration.cs Prevent the git_trace callback from being garbage collected.
LogEntry.cs Implement git log --follow
LogLevel.cs Optimize import directives
MatchedPathsAggregator.cs Make string marshaling either lax or strict
MergeAndCheckoutOptionsBase.cs Introduce MergeOptionsBase
MergeConflictException.cs Introduce CheckoutConflictException
MergeFetchHeadNotFoundException.cs Optimize import directives
MergeHead.cs Drop obsolete members after release v0.17.0
MergeOptions.cs Introduce MergeOptionsBase
MergeOptionsBase.cs Update libgit2 to ff8d635
MergeResult.cs Optimize import directives
MergeTreeOptions.cs Introduce MergeOptionsBase
MergeTreeResult.cs Introduce ObjectDatabase.MergeCommits
Mode.cs Update binaries to 69db893
NameConflictException.cs Fix xml doc related warnings
NativeDllName.targets Use NativeBinaries package for libgit2 dependency
Network.cs Update libgit2 to ff8d635
NetworkExtensions.cs Drop optional parameters in NetworkExtensions.cs
NonFastForwardException.cs Fix xml doc related warnings
NotFoundException.cs Subtransport logic.
Note.cs Update libgit2 to 36a80fd
NoteCollection.cs Update libgit2 to 4eb97ef
NoteCollectionExtensions.cs Publicize Configuration.BuildSignature()
ObjectDatabase.cs Update libgit2 to ff8d635
ObjectDatabaseExtensions.cs Add archive as tar functionality
ObjectId.cs Introduce ObjectDatabase.ShortenObjectId()
ObjectType.cs Fix some issues pinpointed by Code Analysis
OdbBackend.cs Update libgit2 to ff8d635
OdbBackendStream.cs Small refactoring
Patch.cs Introduce PatchEntryChanges
PatchEntryChanges.cs Introduce PatchEntryChanges
PatchStats.cs Introduce Diff.Compare<PatchStats>()
PeelException.cs Introduce PeelException
PullOptions.cs Optimize import directives
PushOptions.cs Drop internal ICredentialsProvider
PushResult.cs Standardize comments style
PushStatusError.cs Standardize comments style
RecurseSubmodulesException.cs Teach clone the ability to recurse into submodules
RefSpec.cs Optimize import directives
RefSpecCollection.cs Optimize import directives
RefSpecDirection.cs Optimize import directives
Reference.cs Drop obsolete members after release v0.20.0
ReferenceCollection.cs Drop optional parameters in ReferenceCollectionExtensions.cs
ReferenceCollectionExtensions.cs Drop optional parameters in ReferenceCollectionExtensions.cs
ReferenceExtensions.cs Standardize comments style
ReferenceWrapper.cs Obsolete ReferenceWrapper.Name in favor of ShortName
ReflogCollection.cs Optimize import directives
ReflogEntry.cs Deprecate ReflogEntry.Commiter in favor of ReflogEntry.Committer
Remote.cs Optimize import directives
RemoteCallbacks.cs Wire up the push_update_reference_callback to fire the PushStatusErro…
RemoteCollection.cs Update libgit2 to ff8d635
RemoteCompletionType.cs Standardize comments style
RemoteUpdater.cs Update libgit2 to ff8d635
RemoveFromIndexException.cs Optimize import directives
RenameDetails.cs Fix some issues pinpointed by Code Analysis
Repository.cs Update libgit2 to ff8d635
RepositoryExtensions.cs Fix a typo in a comment.
RepositoryInformation.cs Optimize import directives
RepositoryNotFoundException.cs Fix xml doc related warnings
RepositoryOperationContext.cs Teach clone the ability to recurse into submodules
RepositoryOptions.cs Update libgit2 to 9bbc8f3
RepositoryStatus.cs Give FileStatus enum entries more meaningful names
ResetMode.cs Update libgit2 to 9bbc8f3
RevertOptions.cs Introduce MergeOptionsBase
RevertResult.cs Optimize import directives
RewriteHistoryOptions.cs Add RewriteHistoryOptions.OnSucceeding and OnError
SecureUsernamePasswordCredentials.cs Added secure string support for credentials; closes #1048
Signature.cs Introduce Identity type
SimilarityOptions.cs Remove trailing whitespaces
SmartSubtransport.cs Optimize import directives
SmartSubtransportRegistration.cs Update libgit2 to ff8d635
SmartSubtransportStream.cs Subtransport logic.
StageLevel.cs Standardize comments style
StageOptions.cs Optimize import directives
Stash.cs Fix some issues pinpointed by Code Analysis
StashCollection.cs Drop optional parameters in StashCollection.cs
StashModifiers.cs Rename StashOptions into StashModifiers
StatusEntry.cs Give FileStatus enum entries more meaningful names
StatusOptions.cs Introduce StatusOptions.IncludeUnaltered
Submodule.cs Fix a typo in a comment.
SubmoduleCollection.cs Update libgit2 to ff8d635
SubmoduleExtensions.cs Standardize comments style
SubmoduleIgnore.cs Update libgit2 binaries to e87d9d3
SubmoduleRecurse.cs Fixup submodule properties
SubmoduleStatus.cs Standardize comments style
SubmoduleUpdate.cs Fixup submodule properties
SubmoduleUpdateOptions.cs Introduce submodule Update and Init
SupportedCredentialTypes.cs Use a callback for credentials
SymbolicReference.cs Capture Reference instances' repo
Tag.cs Add Tag.PeeledTarget property
TagAnnotation.cs Update libgit2 to 36a80fd
TagCollection.cs Drop optional parameters in TagCollection
TagCollectionExtensions.cs Drop optional parameters in TagCollectionExtensions.cs
TagFetchMode.cs Update libgit2 to ff8d635
TarArchiver.cs Cleanup whitespaces
TransferProgress.cs Add TransferProgress.DebuggerDisplay
Tree.cs Cleanup usings
TreeChanges.cs Drop TreeChanges path indexer
TreeDefinition.cs Fail gracefully tree commit create fails
TreeDefinitionExtensions.cs Add TreeDefinition.Remove(IEnumerable<string>)
TreeEntry.cs Upgrade to .Net 4.0
TreeEntryChanges.cs Introduce PatchEntryChanges
TreeEntryDefinition.cs Upgrade to .Net 4.0
TreeEntryTargetType.cs Fix some issues pinpointed by Code Analysis
UnbornBranchException.cs Fix xml doc related warnings
UniqueIdentifier.targets Update UniqueIdentifer.targets to be called from arbitrary directory
UnmatchedPathException.cs Optimize import directives
UnmergedIndexEntriesException.cs Fix xml doc related warnings
UserCanceledException.cs Fix xml doc related warnings
UsernamePasswordCredentials.cs Hide GitCredentialType from public API
Version.cs Optimize import directives
VoidReference.cs Capture Reference instances' repo
libgit2sharp_hash.txt Update libgit2 binaries to 5aee963
packages.config Update libgit2 to ff8d635
Something went wrong with that request. Please try again.