README

Git
- AnnotatedCommit
- CallbackPayload
- CheckoutOptions
- Commit
- Credentials
  - Base
  - SshKey
- Diff
- DiffDelta
- DiffFile
- DiffOptions
- Dir
- Exception
- FetchOptions
- Index
- IndexConflictIterator
- IndexEntry
- InvalidUrl
- MergeConflict
- MergeOptions
- NotExactLocation
- Object
- Oid
- Options
- PushOptions
- Rebase
- RebaseOptions
- Ref
- Refspec
- Remote
- Repo
  - CommitIterator
  - ReferenceCallbackPayload
- Safe
  - AnnotatedCommit
    - AsFree
    - Free
    - Type
    - Unfree
  - Call
  - CallError
  - CheckoutOptions
    - Type
    - Unfree
    - Value
  - Commit
    - AsFree
    - Free
    - Type
    - Unfree
  - Diff
    - AsFree
    - Free
    - Type
    - Unfree
  - DiffDelta
    - AsFree
    - Free
    - Type
    - Unfree
    - Value
  - DiffFile
    - AsFree
    - Free
    - Type
    - Unfree
    - Value
  - DiffOptions
    - Type
    - Unfree
    - Value
  - FetchOptions
    - Type
    - Unfree
    - Value
  - Index
    - AsFree
    - Free
    - Type
    - Unfree
  - IndexConflictIterator
    - AsFree
    - Free
    - Type
    - Unfree
  - IndexEntry
    - AsFree
    - Free
    - Type
    - Unfree
    - Value
  - MergeOptions
    - Type
    - Unfree
    - Value
  - Object
    - AsFree
    - Free
    - Type
    - Unfree
  - Oid
    - AsFree
    - Free
    - Type
    - Unfree
    - Value
  - PushOptions
    - Type
    - Unfree
    - Value
  - Rebase
    - AsFree
    - Free
    - Type
    - Unfree
  - RebaseOptions
    - Type
    - Unfree
    - Value
  - Reference
    - AsFree
    - Free
    - Type
    - Unfree
  - Remote
    - AsFree
    - Free
    - Type
    - Unfree
  - Repository
    - AsFree
    - Free
    - Type
    - Unfree
  - Signature
    - AsFree
    - Free
    - Type
    - Unfree
    - Value
  - StaticStrarray
  - Strarray
    - AsFree
    - Free
    - Type
    - Unfree
    - Value
  - Tree
    - AsFree
    - Free
    - Type
    - Unfree
- Signature
- Strarray
- Tree
- Url
- Util
  - Memo

class Git::MergeConflict

Git::MergeConflict
Git::Exception
Exception
Reference
Object

Defined in:

lib/exceptions.cr

Constructors

.new

Constructor Detail

def self.new #

[View source]