LibGit2Sharp/MergeConflictException.cs


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace LibGit2Sharp
{
    /// <summary>
    /// The exception that is thrown when a checkout cannot be performed
    /// because of a conflicting change staged in the index, or unstaged
    /// in the working directory.
    /// </summary>
    [Serializable]
    [Obsolete("This type will be removed in the next release. Please use CheckoutConflictException instead.")]
    public class MergeConflictException : CheckoutConflictException
    {
    }
}