codys12/MergeLlama-7b
Text Generation • Updated • 6 • 2
conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
[assembly: Guid("f2fac76e-0d80-4099-a64f-2686d4d99b6b")]
=======
[assembly: Guid("f2fac76e-0d80-4099-a64f-2686d4d99b6b")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify a... |
<<<<<<<
private ContentControl _popupContentControl;
private DialogSession _session;
=======
>>>>>>>
private ContentControl _popupContentControl;
private DialogSession _session; |
<<<<<<<
=======
if (newValue)
{
var popupOpenedEventArgs = new RoutedEventArgs()
{
RoutedEvent = OnPopupOpenedEvent,
Source = popupBox
};
popupBox.RaiseEvent(popupOpenedEventArgs);
... |
<<<<<<<
var hitPositionArg = new OutputArgument();
var hitSomethingArg = new OutputArgument();
var entityHandleArg = new OutputArgument();
var surfaceNormalArg = new OutputArgument();
Result = Function.Call<int>(Hash.GET_SHAPE_TEST_RESULT, handle, hitSomethingArg, hitPositionArg, surfaceNormalArg, entity... |
<<<<<<<
useWindowsLineEnding = false;
=======
tabSize = 4;
useTabbedBackspace = true;
>>>>>>>
useWindowsLineEnding = false;
tabSize = 0;
<<<<<<<
useWindowsLineEnding = EditorPrefs.GetBool("MerinoUseWindowsLinesEnding", useWindowsLineEnding );
=======
tabSize = EditorPrefs.GetInt("MerinoTabSiz... |
<<<<<<<
[Fact]
public void ShouldGetCorrectSqlQueryForWhereIn()
=======
[Test]
public void ShouldGetCorrectSqlQueryForWhereInUsingWhereString()
>>>>>>>
[Fact]
public void ShouldGetCorrectSqlQueryForWhereInUsingWhereString()
<<<<<<<
[Fact]
=======
[T... |
<<<<<<<
public IBLFilterGGX(RenderPipelineResources renderPipelinesResources)
=======
public bool supportMis
{
get { return !TextureCache.isMobileBuildTarget; }
}
public IBLFilterGGX(RenderPipelineResources renderPipelineResources)
>>>>>>>
public IBLFilter... |
<<<<<<<
[assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor")]
=======
[assembly: InternalsVisibleTo("Unity.ShaderGraph.GraphicsTests")]
[assembly: InternalsVisibleTo("Unity.ShaderGraph.Editor.GraphicsTests")]
[assembly: InternalsVisibleTo("Unity.RenderPipelines.Lightweight.Editor")]
>>>>>>>
[assem... |
<<<<<<<
/// Looks up a localized string similar to Move to the end of the line..
/// </summary>
internal static string MoveToEndOfLineDescription {
get {
return ResourceManager.GetString("MoveToEndOfLineDescription", resourceCulture);
}
}
... |
<<<<<<<
// If the Url parameter only contains whitespaces or is empty return with BadRequest.
if (string.IsNullOrWhiteSpace(input.Url))
{
return req.CreateErrorResponse(HttpStatusCode.BadRequest, "The url parameter can not be empty.");
}
=======
... |
<<<<<<<
using (new Utilities.ProfilingSample("Build Light list and render shadows", renderContext))
{
// TODO: Everything here (SSAO, Shadow, Build light list, material and light classification can be parallelize with Async compute)
... |
<<<<<<<
=======
using System.Collections.Generic;
>>>>>>>
<<<<<<<
AssertRegistrationsAreSame(r => r.Name, "", "special");
=======
this.AssertRegistrationsAreSame(r => r.Name, String.Empty, "special");
>>>>>>>
this.AssertRegistrationsAreSame(r => r.Name, String.Empty, "special"... |
<<<<<<<
=======
using System;
using System.Collections.Generic;
>>>>>>>
<<<<<<<
CollectionAssertExtensions.AreEqual(
new[] { "string", "int", "ILogger", "MockLogger", "SpecialLogger", "DependentConstructor", "TwoConstructorArgs", "MockDatabase" },
Section.TypeAliases.Sele... |
<<<<<<<
CollectionAssertExtensions.AreEqual(new[] { "", "two" },
Section.Containers.Select(c => c.Name).ToList());
=======
CollectionAssert.AreEqual(new[] { String.Empty, "two" },
section.Containers.Select(c => c.Name).ToList());
>>>>>>>
CollectionA... |
<<<<<<<
using DependencyAttribute=Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute;
using InjectionConstructorAttribute=Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute;
using InjectionMethodAttribute=Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.Injectio... |
<<<<<<<
AssertExtensions.IsInstanceOfType(accountResult, typeof(LoggingCommand<Account>));
=======
Assert.IsInstanceOfType(accountResult, typeof(LoggingCommand<Account>));
>>>>>>>
AssertExtensions.IsInstanceOfType(accountResult, typeof(LoggingCommand<Account>));
<<<<<<<
... |
<<<<<<<
=======
using System;
using System.Collections.Generic;
>>>>>>>
<<<<<<<
CollectionAssertExtensions.AreEqual(new[] { "int", "string" },
Section.TypeAliases.Select(alias => alias.Alias).ToList());
=======
CollectionAssert.AreEqual(new[] { "int", "string" },
... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Fiddler;
using Grabacr07.KanColleWrapper.Models.Raw;
namespace Grabacr07.KanColleWrapper.Models
{
/// <summary>
/// 母港に所属している艦娘を表します。
/// </summary>
public cl... |
<<<<<<<
// NOTE: When updating the version, you also need to update the Identity/@Version
// attribtute in src\NuProj.Package\source.extension.vsixmanifest.
[assembly: AssemblyVersion("0.9.2.0")]
[assembly: AssemblyFileVersion("0.9.2.0")]
=======
[assembly: AssemblyVersion("0.9.3.0")]
[assembly: AssemblyFileVe... |
<<<<<<<
=======
using System.Collections.Generic;
using System.IO;
>>>>>>>
using System.Collections.Generic;
using System.IO;
<<<<<<<
=======
using System.Reflection;
using System.Runtime.Versioning;
>>>>>>>
using System.Reflection;
using System.Runtime.Versioning; |
<<<<<<<
using Castle.IO;
using Castle.IO.Internal;
using Castle.MicroKernel;
using Castle.MicroKernel.Facilities;
using Castle.MicroKernel.Registration;
using Castle.MicroKernel.SubSystems.Naming;
using Castle.Transactions;
using Castle.Transactions.Activities;
using Castle.Transactions.Internal;
using Castle.Transacti... |
<<<<<<<
private static readonly Logger _Logger = LogManager.GetCurrentClassLogger();
=======
>>>>>>>
<<<<<<<
_Logger.Debug("created transaction interceptor");
=======
>>>>>>>
_Logger.Debug("created transaction interceptor");
<<<<<<<
private static void SynchronizedCase(IInvocation invocation, ITran... |
<<<<<<<
SetupFrameRenderingConfiguration(out frameRenderingConfiguration, screenspaceShadows, stereoEnabled, sceneViewCamera);
SetupIntermediateResources(frameRenderingConfiguration, ref context);
=======
SetupFrameRenderingConfiguration(out frameRenderingConfiguration,... |
<<<<<<<
case "embed":
if (string.IsNullOrEmpty(value))
{
embedAllSourceFiles = true;
continue;
}
embeddedFiles.AddRange(ParseSeparatedFileArgument(... |
<<<<<<<
BindTargetToMethod_Object_RoutineInfo = ct.Operators.Method("BindTargetToMethod", ct.Object, ct.RoutineInfo);
BuildGenerator_Context_Object_PhpArray_PhpArray_GeneratorStateMachineDelegate_RuntimeMethodHandle = ct.Operators.Method("BuildGenerator", ct.Context, ct.Object, ct.PhpAr... |
<<<<<<<
var place = refexpr.Place();
if (place != null && place.HasAddress && place.TypeOpt == targetp.Type)
=======
var place = refexpr.Place(_il);
if (place != null && place.HasAddress && place.Type == targetp.Type)
>>>>>>>
... |
<<<<<<<
public enum HeightmapParametrization
{
MinMax = 0,
Amplitude = 1
}
=======
public enum MaterialId
{
LitSSS = 0,
LitStandard = 1,
LitAniso = 2,
LitClearCoat = 3,
LitSpecular = 4,
... |
<<<<<<<
var place = varref.Place();
if (place != null && place.HasAddress && place.TypeOpt == _cg.CoreTypes.PhpValue)
=======
var place = varref.Place(_cg.Builder);
if (place != null && place.HasAddress && ... |
<<<<<<<
cullingParameters.shadowDistance = m_ShadowSettings.maxShadowDistance;
CullResults.Cull(ref cullingParameters, context,ref m_CullResults);
=======
cullingParameters.shadowDistance = Mathf.Min(m_ShadowSettings.maxShadowDistance, camera.farClipPlane);
... |
<<<<<<<
// TODO: Move this code inside LightLoop
if (m_LightLoop.GetFeatureVariantsEnabled())
{
// For material classification we use compute shader and so can't read into the stencil, so prepare it.
using (new P... |
<<<<<<<
protected int mReadDataSize; // 写入数据时,总共写入的数据大小
protected int mMaxDataSize; // 包体最大的大小,包括如果不使用变长数组时的大小
protected bool mIntReplaceULLong; // 如果ullong的值小于int最大值,是否在序列化时写入或读取int
=======
protected int mMaxDataSize;
protected bool mFixedLength; // 是否所有参数都是定长的
>>>>>>>
protected int mReadD... |
<<<<<<<
private async void Row_Drop(object sender, DragEventArgs e)
{
var row = (Border)sender;
var fse = (FileSystemElement)row.Tag;
StyleHitbox(row, ROW_DEFAULT_STYLE_NAME);
if (fse.IsFolder && e.DataView.Contains(StandardDataFormats.StorageItems))
... |
<<<<<<<
deliverEventArgs = Queue.Dequeue();
=======
if (!_disposed)
{
deliverEventArgs = Queue.Dequeue() as BasicDeliverEventArgs;
}
>>>>>>>
if (!_disposed)
{
deliver... |
<<<<<<<
private bool useCCD = false;
=======
private bool allowParent = false;
private bool continous = false;
>>>>>>>
private bool allowParent = false;
private bool useCCD = false;
<<<<<<<
float bodyAngle = this.body.Rotation - bodyAngleVel * (1.0f... |
<<<<<<<
memoryLogOutput = new EditorLogOutput();
Logs.AddGlobalOutput(memoryLogOutput);
// Set up a global exception handler to log errors
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
=======
memoryLogOutput = new InMemoryLogOutput();
Log.AddGlobalOutput(memory... |
<<<<<<<
using (Texture texture = new Texture(width, height, TextureSizeMode.NonPowerOfTwo))
using (RenderTarget renderTarget = new RenderTarget(AAQuality.Off, true, texture))
=======
using (Texture texture = new Texture(width, height, TextureSizeMode.NonPowerOfTwo, TextureMagFilter.Nearest, TextureMinFilter.... |
<<<<<<<
canvas.State.DepthOffset = -1;
=======
canvas.State.ZOffset = this.depthOffset;
canvas.State.SetMaterial(new BatchInfo(DrawTechnique.Alpha, ColorRgba.White));
>>>>>>>
canvas.State.DepthOffset = this.depthOffset;
canvas.State.SetMaterial(new BatchInfo(DrawTechnique.Alpha, ColorRgba.White)); |
<<<<<<<
[EditorHintRange(0, int.MaxValue)]
public Point2 Size
=======
[EditorHintRange(1, int.MaxValue)]
[EditorHintIncrement(1)]
[EditorHintDecimalPlaces(0)]
public Vector2 Size
>>>>>>>
[EditorHintRange(1, int.MaxValue)]
public Point2 Size |
<<<<<<<
private ConcreteSlotValueType ConvertDynamicMatrixInputTypeToConcrete(IEnumerable<ConcreteSlotValueType> inputTypes)
{
var concreteSlotValueTypes = inputTypes as IList<ConcreteSlotValueType> ?? inputTypes.ToList();
var inputTypesDistinct = concreteSlotValueTypes.Distinct... |
<<<<<<<
float clampedDelta = forceFixedStep ? SecondsPerFrame : MathF.Min(realDelta, SecondsPerFrame * 2);
gameDelta = timeScale * clampedDelta;
timeMult = gameDelta / SecondsPerFrame;
if (DualityApp.ExecContext == DualityApp.ExecutionContext.Game)
gameTimer += TimeSpan.FromTicks((long)(gameDelta ... |
<<<<<<<
Logs.Core.Write("DualityApp Sandbox terminated");
=======
Log.Core.Write("DualityApp terminated in sandbox mode.");
>>>>>>>
Logs.Core.Write("DualityApp terminated in sandbox mode.");
<<<<<<<
=======
// Wrapper method for delivering the old API until removing it in v3.0
if (DiscardPluginD... |
<<<<<<<
=======
/// <summary>
/// [GET] Provides information about the order in which different <see cref="Component"/>
/// types are updated, initialized and shut down.
/// </summary>
public static ComponentExecutionOrder ExecOrder
{
get { return execOrder; }
}
/// <summary>
/// Returns whether... |
<<<<<<<
[assembly: InternalsVisibleTo("ReactiveUI.NLog")]
[assembly: InternalsVisibleTo("ReactiveUI.Gtk")]
[assembly: InternalsVisibleTo("ReactiveUI.Cocoa")]
[assembly: InternalsVisibleTo("ReactiveUI.Android")]
[assembly: InternalsVisibleTo("ReactiveUI.Mobile")]
[assembly: InternalsVisibleTo("ReactiveUI.Winforms")]
[as... |
<<<<<<<
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
var handler = PropertyChanged;
if (handler != null)
{
handler(this, args);
}
}
protected ReactiveFragment()
{
s... |
<<<<<<<
/// <summary>When enabled, Cameras using these Frame Settings calculate Transparent Screen Space Reflections.</summary>
[FrameSettingsField(1, displayedName: "Transparent Screen Space Reflection", customOrderInGroup: 25, positiveDependencies: new[] { SSR }, tooltip: "When enabled, Cameras using ... |
<<<<<<<
Console.WriteLine(RxApp.MainThreadScheduler.GetType().FullName);
Assert.Equal(CurrentThreadScheduler.Instance, RxApp.MainThreadScheduler);
=======
Console.WriteLine(RxApp.DeferredScheduler.GetType().FullName);
Assert.Equal(Scheduler.Immediate, RxApp.DeferredSche... |
<<<<<<<
// IViewFor<IFooBarViewModel>
try {
var ifn = interfaceifyTypeName(viewModel.GetType().AssemblyQualifiedName);
var type = Reflection.ReallyFindType(ifn, false);
if (type != null) {
var ret = RxApp.DependencyResolver.Get... |
<<<<<<<
private GraphView m_GraphView;
GraphTypeMapper typeMapper { get; set; }
=======
>>>>>>>
private GraphView m_GraphView;
<<<<<<<
typeMapper = new GraphTypeMapper(typeof(MaterialNodeView));
typeMapper[typeof(AbstractMaterialNode)] = typeof(MaterialNodeView);
... |
<<<<<<<
[IgnoreDataMember]
public IObservable<IObservedChange<ReactiveActivity, object>> Changing {
get { return this.getChangingObservable(); }
=======
public IObservable<IObservedChange<object, object>> Changing {
get { return this.getChangingObservable(); }
>>>>>>>
... |
<<<<<<<
internal static IObservable<object> ViewModelWhenAnyValue<TView, TViewModel>(TViewModel viewModel, TView view, Expression expression)
=======
public static void ThrowIfMethodsNotOverloaded(string callingTypeName, object targetObject, params string[] methodsToCheck)
{
var mi... |
<<<<<<<
using System.Collections.Generic;
=======
using System.Collections.Generic;
using System.Threading.Tasks;
>>>>>>>
using System.Collections.Generic;
using System.Threading.Tasks; |
<<<<<<<
public InlineQueryResultArticle(string id, string title, InputMessageContent inputMessageContent)
: base(InlineQueryResultType.Article, id)
=======
public InlineQueryResultArticle(string id, string title, InputMessageContentBase inputMessageContent)
: this()
>>>>>>>
... |
<<<<<<<
/// <typeparam name="TResult">Expected type of operation result</typeparam>
[JsonObject(MemberSerialization.OptIn)]
public class ApiResponse<TResult> : IResponse
=======
/// <typeparam name="T">The resultant object</typeparam>
[JsonObject(MemberSerialization = MemberSerialization.OptIn,
... |
<<<<<<<
public ChatMemberStatus Status { get; internal set; }
=======
[JsonConverter(typeof(StringEnumConverter))]
public ChatMemberStatus Status { get; set; }
>>>>>>>
public ChatMemberStatus Status { get; set; } |
<<<<<<<
public InputMessageContent InputMessageContent { get; set; }
private InlineQueryResultCachedAudio()
=======
public InputMessageContentBase InputMessageContent { get; set; }
/// <summary>
/// Initializes a new inline query result
/// </summary>
... |
<<<<<<<
#if !UNITY_SWITCH
if (LightweightUtils.HasFlag(renderingConfig, FrameRenderingConfiguration.Stereo))
=======
if (CoreUtils.HasFlag(renderingConfig, FrameRenderingConfiguration.Stereo))
>>>>>>>
#if !UNITY_SWITCH
if (CoreUtils.HasFlag(renderingConfig, FrameRenderingConfigura... |
<<<<<<<
m_cubeBlockDefinitionsManager.Load(GetContentDataFile("CubeBlocks.sbc"));
LBX_BlocksConfiguration.Items.Clear();
=======
LST_BlocksConfiguration.Items.Clear();
m_cubeBlockDefinitionsManager = new CubeBlockDefinitionsManager(m_configSerializer.CubeBlockDefinitions);
>>>>>>>
m_cubeBlockDefiniti... |
<<<<<<<
public static GUIContent ppdPrimitiveLength = new GUIContent("Primitive length", "Dimensions of the primitive (with the scale of 1) to which the per-pixel displacement mapping is being applied. For example, the standard quad is 1 x 1 meter, while the standard plane is 10 x 10 meters.");
... |
<<<<<<<
namespace SEModAPI
=======
namespace SEModAPI.API
>>>>>>>
namespace SEModAPI.API
<<<<<<<
private MyObjectBuilder_Definitions m_ammoMagazineDefinitions;
private MyObjectBuilder_Definitions m_blueprintDefinitions;
private MyObjectBuilder_Definitions m_cubeBlockDefinitions;
private MyObjec... |
<<<<<<<
public static readonly int[] _DBufferTexture =
{
Shader.PropertyToID("_DBufferTexture0"),
Shader.PropertyToID("_DBufferTexture1"),
Shader.PropertyToID("_DBufferTexture2"),
Shader.PropertyToID("_DBufferTexture3")
};
=======
public... |
<<<<<<<
using UnityEngine.Experimental.UIElements;
=======
using System.Reflection;
>>>>>>>
using System.Reflection;
using UnityEngine.Experimental.UIElements;
<<<<<<<
public static void Add<T>(this VisualElement visualElement, T elementToAdd, Action<T> action)
where T : VisualElement
{... |
<<<<<<<
/// <summary>
/// Sample implementation of a token cache which persists tokens specific to a user to Redis to be used in multi-tenanted scenarios
/// the key is the users object unique object identifier.
/// </summary>
=======
// sample implementation of a token cache which persists tokens... |
<<<<<<<
public class Synchronization : IResponseHolder
=======
public class NodeWaitInterval : Durable
{
public int Count { get; set; }
public Durable NodeInterval { get; set; }
public SyncReason Reason { get; set; }
public double Percent
{
get
... |
<<<<<<<
var cookie = new Cookie
{
Name = httpCookie.Name,
Value = httpCookie.Value,
Domain = webRequest.RequestUri.Host
};
=======
#if FRAMEWORK
Cookie cookie = new Cookie
{
... |
<<<<<<<
/// <summary>
///
/// </summary>
public interface IRestClient
{
/// <summary>
///
/// </summary>
#if !PocketPC
CookieContainer CookieContainer { get; set; }
#endif
/// <summary>
///
/// </summary>
string UserAgent { get; set;... |
<<<<<<<
foreach(var file in Files)
{
// Add just the first part of this param, since we will write the file data directly to the Stream
WriteStringTo(requestStream, GetMultipartFileHeader(file));
// Write the file data directly to the Stream, rather than serializing it to a string.
file.Writer(re... |
<<<<<<<
=======
bool UnsafeAuthenticatedConnectionSharing { get; set; }
#if FRAMEWORK
>>>>>>>
bool UnsafeAuthenticatedConnectionSharing { get; set; } |
<<<<<<<
_interceptor = interceptor;
=======
_serviceFactory.Services = services;
>>>>>>>
_interceptor = interceptor;
_serviceFactory.Services = services; |
<<<<<<<
string imageUrl;
double scale;
Color bgColor = new Color();
=======
>>>>>>>
<<<<<<<
ImageCommentParser.TryParse(matchedText, out imageUrl, out scale, ref bgColor, out xmlParseException);
=======
string imageUrl;
double sca... |
<<<<<<<
using System.Linq;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
=======
using System.Linq;
>>>>>>>
using System.Linq;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
<<<<<<<
protected ITestRunner GetRunnerFor(string assemblyName, IGrouping<string, TestCase> testCases)
=======
... |
<<<<<<<
DiscoveryMethod DiscoveryMethod { get; }
=======
bool SkipNonTestAssemblies { get; }
>>>>>>>
DiscoveryMethod DiscoveryMethod { get; }
bool SkipNonTestAssemblies { get; }
<<<<<<<
public DiscoveryMethod DiscoveryMethod { get; private set; } = DiscoveryMethod.Old;
=====... |
<<<<<<<
while (true)
{
methodDef = typeDef.Methods.FirstOrDefault(o => o.Name == methodName);
if (methodDef != null)
break;
var baseType = typeDef.BaseType;
if (baseType == null || baseType.FullName == "System.... |
<<<<<<<
MaxCpuCount = GetInnerTextAsInt(runConfiguration, "MaxCpuCount", -1);
ResultsDirectory = GetInnerText(runConfiguration, "ResultsDirectory");
TargetPlatform = GetInnerText(runConfiguration, "TargetPlatform");
TargetFrameworkVersion = GetInnerText(runConfiguration, ... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Data.Entity.Infrastructure;
using System.Linq;
using System.Text;
using System.Linq.Expressions;
using System.Collections;
using System.Threading;
using System.Threading.Tasks;
using System.Data.Entity;
namespace LinqKit
{
/// <summary>
/// An IQu... |
<<<<<<<
var sut = CampaignAdminControllerBuilder.AllNullParamsInstance().Build();
=======
var sut = new CampaignController(null, null);
sut.SetClaims(new List<Claim>());
>>>>>>>
var sut = CampaignAdminControllerBuilder.AllNullParamsInstance().Build();
sut.... |
<<<<<<<
using Microsoft.EntityFrameworkCore;
=======
using AllReady.ViewModels.Home;
using Microsoft.Data.Entity;
>>>>>>>
using Microsoft.EntityFrameworkCore;
using AllReady.ViewModels.Home; |
<<<<<<<
using System;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore.Migrations;
=======
using Microsoft.Data.Entity.Migrations;
>>>>>>>
using Microsoft.EntityFrameworkCore.Migrations; |
<<<<<<<
using AllReady.Providers;
using System.IO;
=======
>>>>>>>
using System.IO; |
<<<<<<<
using System;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore.Migrations;
=======
using Microsoft.Data.Entity.Migrations;
>>>>>>>
using Microsoft.EntityFrameworkCore.Migrations; |
<<<<<<<
using System;
using System.Collections.Generic;
using AllReady.Models;
using Microsoft.EntityFrameworkCore.Migrations;
=======
using Microsoft.Data.Entity.Migrations;
>>>>>>>
using Microsoft.EntityFrameworkCore.Migrations; |
<<<<<<<
public DbSet<FileAttachment> Attachments { get; set; }
=======
public DbSet<CampaignManager> CampaignManagers { get; set; }
public DbSet<EventManager> EventManagers { get; set; }
public DbSet<EventManagerInvite> EventManagerInvites { get; set; }
public DbSet<CampaignMan... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using AllReady.Models;
using MediatR;
using Microsoft.Data.Entity;
using Microsoft.Extensions.OptionsModel;
namespace AllReady.Features.Notifications
{
public class NotifyAdminForTaskSignupStatusChange : INoti... |
<<<<<<<
var refactoringContext = new OmniSharpRefactoringContext(doc, resolver, location);
refactoringContext.Services.AddService (typeof(NamingConventionService), new DefaultNameService ());
=======
OmniSharpRefactoringContext refactoringContext;
if(request is CodeActi... |
End of preview. Expand in Data Studio
MergeLlama is a unique dataset that encapsulates real-world merge conflicts alongside their corresponding resolutions. Developed from the foundational dataset shared in "Anonymous. (2022). Data set for FSE 2022 Submission Program Merge Conflict Resolution via Neural Transformers", MergeLlama provides a comprehensive collection of conflict scenarios and how they were resolved. With potential multiple conflicts in a single entry followed by its respective resolution, this dataset serves as a rich resource for understanding merge conflicts and developing automated resolution strategies.
For those using this dataset, please cite as follows:
"MergeLlama Dataset. (2023). Merge Conflicts Fused with Their Resolutions. Based on: Anonymous. (2022). Data set for FSE 2022 Submission Program Merge Conflict Resolution via Neural Transformers (1.0) [Data set]. Zenodo. https://doi.org/10.5281/zenodo.6366908".
- Downloads last month
- 11
Size of downloaded dataset files:
104 MB
Size of the auto-converted Parquet files:
23.8 MB
Number of rows:
46,490
Models trained or fine-tuned on codys12/MergeLlama