conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
Console.WriteLine(" GetMerchantDetails");
=======
Console.WriteLine(" GetHostedPaymentPage");
>>>>>>>
Console.WriteLine(" GetMerchantDetails");
Console.WriteLine(" GetHostedPaymentPage");
<<<<<<<
case "GetMerchantDetails":
... |
<<<<<<<
Console.WriteLine(" GetBatchStatistics");
Console.WriteLine(" GetSettledBatchList");
=======
Console.WriteLine(" CreateCustomerShippingAddress");
Console.WriteLine(" DeleteCustomerProfile");
Console.WriteLine(" DeleteCustomerPaymentPro... |
<<<<<<<
public bool CheckTemporalTables { get; set; } = false;
=======
public string ReseedSql { get; private set; }
>>>>>>>
public string ReseedSql { get; private set; }
public bool CheckTemporalTables { get; set; } = false;
<<<<<<<
if (_temporalTables.Count() > 0)
... |
<<<<<<<
{
if (isByRef)
sb.AppendLine(" ptr_of_this_method = ILIntepreter.GetObjectAndResolveReference(ptr_of_this_method);");
if (isMultiArr)
{
sb.AppendLine(str... |
<<<<<<<
=======
this.CanChangeTime = this.AccessMode.CombineLatest(this.settings.WhenAnyValue(x => x.LockTime),
(accessMode, lockTime) => accessMode == Management.AccessMode.Administrator || !lockTime);
this.CanChangeVolume = this.AccessMode.CombineLatest(this.settings.WhenAn... |
<<<<<<<
#region Usings
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Net.Http;
using Syst... |
<<<<<<<
#if CONTRACTS_FULL
/// <summary>
/// Verifies conditions that should be true for any valid state of this object.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Called by code contracts.")]
[SuppressMessage("Microsoft.Performance", "CA1811:Avoid... |
<<<<<<<
/// The name of the <xriResolver> sub-element.
/// </summary>
private const string XriResolverElementName = "xriResolver";
/// <summary>
/// Gets the name of the @maxAuthenticationTime attribute.
=======
/// The name of the @maxAuthenticationTime attribute.
>>>>>>>
/// The name of the &l... |
<<<<<<<
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "no-pii", Scope = "resource", Target = "DotNetOpenAuth.OpenId.Behaviors.BehaviorStrings.resources")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.... |
<<<<<<<
Map<Uri>(uri => uri.AbsoluteUri, safeUri);
Map<DateTime>(dt => XmlConvert.ToString(dt, XmlDateTimeSerializationMode.Utc), str => XmlConvert.ToDateTime(str, XmlDateTimeSerializationMode.Utc));
Map<TimeSpan>(ts => ts.ToString(), str => TimeSpan.Parse(str));
Map<byte[]>(safeFromByteArray, safeToByteArr... |
<<<<<<<
string xsrfKey = MessagingUtilities.GetNonCryptoRandomDataAsBase64(16);
cookies.Add(new CookieHeaderValue(XsrfCookieName, xsrfKey) {
=======
var context = this.Channel.GetHttpContext();
string xsrfKey = MessagingUtilities.GetNonCryptoRandomDataAsBase64(16, useWeb64: true);
cookie = new Ht... |
<<<<<<<
/// The name of the attribute that indicates whether to disable SSL requirements across the library.
/// </summary>
private const string RelaxSslRequirementsConfigName = "relaxSslRequirements";
/// <summary>
=======
/// The name of the attribute that controls whether messaging rules are strictly fo... |
<<<<<<<
using System.Diagnostics.Contracts;
=======
using System.Diagnostics.CodeAnalysis;
>>>>>>>
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.Contracts; |
<<<<<<<
Identifier userSuppliedIdentifier = ((AuthenticationRequest)req).Endpoint.UserSuppliedIdentifier;
req.SetCallbackArgument(AuthenticationRequest.UserSuppliedIdentifierParameterName, userSuppliedIdentifier.OriginalString);
=======
req.SetUntrustedCallbackArgument(AuthenticationRequest.UserSupplie... |
<<<<<<<
: this(serviceDescription, tokenManager, new NonceMemoryStore(StandardExpirationBindingElement.MaximumMessageAge), messageTypeProvider) {
Contract.Requires<ArgumentNullException>(serviceDescription != null);
Contract.Requires<ArgumentNullException>(tokenManager != null);
Contract.Requires<ArgumentNu... |
<<<<<<<
public PrivatePersonalIdentifierProviderBase(Uri baseIdentifier) {
Contract.Requires<ArgumentNullException>(baseIdentifier != null);
=======
protected PrivatePersonalIdentifierProviderBase(Uri baseIdentifier) {
Contract.Requires(baseIdentifier != null);
>>>>>>>
protected PrivatePersonalIdentifier... |
<<<<<<<
internal AutoResponsiveRequest(IDirectedProtocolMessage request, IProtocolMessage response)
: base(request) {
Contract.Requires<ArgumentNullException>(response != null);
=======
/// <param name="securitySettings">The security settings.</param>
internal AutoResponsiveRequest(IDirectedProtocolMessag... |
<<<<<<<
#if DEBUG
internal static readonly RequestCachePolicy IdentifierDiscoveryCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.BypassCache);
#else
internal static readonly RequestCachePolicy IdentifierDiscoveryCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.CacheIfAvailable);
#endif
... |
<<<<<<<
: base(requireSsl) {
Contract.Requires<ArgumentException>(!String.IsNullOrEmpty(xri));
Contract.Requires<FormatException>(IsValidXri(xri), OpenIdStrings.InvalidXri);
=======
: base(xri, requireSsl) {
Contract.Requires((xri != null && xri.Length > 0) || !string.IsNullOrEmpty(xri));
ErrorUtili... |
<<<<<<<
: this(serviceDescription, tokenManager, new NonceMemoryStore(StandardExpirationBindingElement.MaximumMessageAge), messageTypeProvider) {
=======
: this(serviceDescription, tokenManager, new NonceMemoryStore(StandardExpirationBindingElement.DefaultMaximumMessageAge), messageTypeProvider) {
Contract.R... |
<<<<<<<
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames", Justification = "We sign it when producing drops.")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespa... |
<<<<<<<
DotNetOpenAuth.OpenId.Behaviors.USGovernmentLevel1.PpidIdentifierProvider = new Code.AnonymousIdentifierProvider();
=======
DotNetOpenAuth.OpenId.Behaviors.PpidGeneration.PpidIdentifierProvider = new Code.AnonymousIdentifierProvider();
>>>>>>>
DotNetOpenAuth.OpenId.Behaviors.PpidGeneration.PpidIdent... |
<<<<<<<
public void DisableDuplicateEventDetection_RemovesDisableDuplicateEventDetection()
{
Sut.DisableDuplicateEventDetection();
Assert.DoesNotContain(Sut.EventProcessors,
p => p.GetType() == typeof(DuplicateEventDetectionEventProcessor));
}
[Fa... |
<<<<<<<
if (DesignMode)
implementation = new Platform.Dummy.DummyGLControl();
else if (Configuration.RunningOnWindows)
implementation = new Platform.Windows.WinGLControl(mode, this);
else if (Configuration.RunningOnX11)
implementation =... |
<<<<<<<
=======
using MediaBrowser.Model.Xml;
using Microsoft.Extensions.Configuration;
>>>>>>>
using MediaBrowser.Model.Xml;
using Microsoft.Extensions.Configuration;
<<<<<<<
public MusicBrainzAlbumProvider(IHttpClient httpClient, IApplicationHost appHost, ILogger logger, IJsonSerializer json)
=======
... |
<<<<<<<
/// <summary>
/// Initializes a new instance of the <see cref="SeriesNfoProvider"/> class.
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="fileSystem">The file system.</param>
/// <param name="config">the configuration manager.</param>... |
<<<<<<<
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
using MediaBrowser.Common.Json.Converters;
using MediaBrowser.Model.Querying;
=======
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
using MediaBrowser.Common.Json.Converters;
using MediaBrowser.Model.En... |
<<<<<<<
typeof(Routines.RemoveDuplicateExtras),
typeof(Routines.AddDefaultPluginRepository)
=======
typeof(Routines.RemoveDuplicateExtras),
typeof(Routines.MigrateUserDb)
>>>>>>>
typeof(Routines.RemoveDuplicateExtras),
typeof(Routines.AddDefault... |
<<<<<<<
[FromQuery] ImageType[] enableImageTypes,
[FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
=======
[FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ImageType[] enableImageTypes,
[FromQuery] string? fields,
>>... |
<<<<<<<
Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de>
=======
Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de>
>>>>>>>
Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de>
<<<<<<<
BinaryReaderEx br = null;
BinaryReaderEx brDecrypted = null;
S... |
<<<<<<<
using System.Collections.Generic;
=======
using Jellyfin.Server.Middleware;
>>>>>>>
using System.Collections.Generic;
using Jellyfin.Server.Middleware;
<<<<<<<
c.RoutePrefix = "api-docs/swagger";
=======
c.RoutePrefix = $"{baseUrl}api-docs/swagger";
... |
<<<<<<<
/// <summary>
/// Initializes a new instance of the <see cref="ArtistNfoProvider"/> class.
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="fileSystem">The file system.</param>
/// <param name="config">the configuration manager.</param>... |
<<<<<<<
ZipClient = new ZipClient();
RegisterSingleInstance(ZipClient);
=======
ZipClient = new ZipClient(FileSystemManager);
serviceCollection.AddSingleton(ZipClient);
>>>>>>>
ZipClient = new ZipClient();
serviceCollection.AddSingleton(ZipClien... |
<<<<<<<
/// <summary>
/// Initializes a new instance of the <see cref="MovieNfoProvider"/> class.
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="fileSystem">The file system.</param>
/// <param name="config">the configuration manager.</param>
... |
<<<<<<<
kdbx.Load(s, KdbxFormat.Default, slLogger);
=======
Stream s = IOConnection.OpenRead(ioSource);
kdbx.Load(s, KdbpFile.GetFormatToUse(ioSource), slLogger);
>>>>>>>
kdbx.Load(s, KdbpFile.GetFormatToUse(ioSource), slLogger); |
<<<<<<<
Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de>
Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll
=======
Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de>
>>>>>>>
Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-onl... |
<<<<<<<
/// <param name="output"></param>
/// <returns></returns>
internal Version GetFFmpegVersion(string output)
=======
/// <param name="output">The output from "ffmpeg -version".</param>
/// <returns>The FFmpeg version.</returns>
internal static Version GetFFmpegVer... |
<<<<<<<
ItemRepository = new SqliteItemRepository(ServerConfigurationManager, this, JsonSerializer, LoggerFactory, assemblyInfo, LocalizationManager);
=======
ItemRepository = new SqliteItemRepository(ServerConfigurationManager, this, JsonSerializer, LoggerFactory);
>>>>>>>
ItemRe... |
<<<<<<<
using var subReader = reader.ReadSubtree();
await ParseFirstBodyChildAsync(subReader, result.Headers).ConfigureAwait(false);
return result;
=======
var result = new ControlRequestInfo(localName, namespaceURI);
... |
<<<<<<<
/// Class GetPersonImage
=======
/// Class UpdateItemImageIndex.
/// </summary>
[Route("/Items/{Id}/Images/{Type}/{Index}/Index", "POST", Summary = "Updates the index for an item image")]
[Authenticated(Roles = "admin")]
public class UpdateItemImageIndex : IReturnVoid
{
///... |
<<<<<<<
@"(.+[^_\,\.\(\)\[\]\-])[_\.\(\)\[\]\-](19\d{2}|20\d{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19\d{2}|20\d{2})*",
@"(.+[^_\,\.\(\)\[\]\-])[ _\.\(\)\[\]\-]+(19\d{2}|20\d{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19\d{2}|20\d{2})*",
@"(.+\w)\W+\p{Ps}(19[0-9]{2}|20[0-9]{2})\p{Pe}", /... |
<<<<<<<
using Jellyfin.Server.Implementations;
using Jellyfin.Server.Implementations.Activity;
using Jellyfin.Server.Implementations.User;
=======
using Jellyfin.Server.Implementations;
using Jellyfin.Server.Implementations.Activity;
>>>>>>>
using Jellyfin.Server.Implementations;
using Jellyfin.Server.Implementation... |
<<<<<<<
Copyright (C) 2003-2012 Dominik Reichl <dominik.reichl@t-online.de>
Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll
=======
Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de>
>>>>>>>
Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-onl... |
<<<<<<<
[ProducesFile("video/*", "audio/*")]
public ActionResult GetFile([FromRoute] Guid itemId)
=======
public ActionResult GetFile([FromRoute, Required] Guid itemId)
>>>>>>>
[ProducesFile("video/*", "audio/*")]
public ActionResult GetFile([FromRoute, Required] Guid itemId)
... |
<<<<<<<
Copyright (C) 2003-2012 Dominik Reichl <dominik.reichl@t-online.de>
Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll
=======
Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de>
>>>>>>>
Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-onl... |
<<<<<<<
using Jellyfin.Data.Entities;
=======
#pragma warning disable CS1591
>>>>>>>
#pragma warning disable CS1591
using Jellyfin.Data.Entities; |
<<<<<<<
public ActionResult<FileStreamResult> GetGeneralImage([FromRoute, Required] string name, [FromRoute, Required] string type)
=======
[ProducesImageFile]
public ActionResult GetGeneralImage([FromRoute, Required] string? name, [FromRoute, Required] string? type)
>>>>>>>
[Produces... |
<<<<<<<
var mapArgs = state.IsOutputVideo ? _encodingHelper.GetMapArgs(state) : string.Empty;
=======
var format = !string.IsNullOrWhiteSpace(state.Request.SegmentContainer) ? "." + state.Request.SegmentContainer : ".ts";
var directory = Path.GetDirectoryName(outputPath) ?? throw n... |
<<<<<<<
using System.IO;
using System.Threading.Tasks;
using Jellyfin.Data.Entities;
=======
using MediaBrowser.Controller.Entities;
>>>>>>>
using Jellyfin.Data.Entities; |
<<<<<<<
/// <inheritdoc />
public PackageVersionClass SystemUpdateLevel
{
get
{
#if BETA
return PackageVersionClass.Beta;
#else
return PackageVersionClass.Release;
#endif
}
}
=======
public IFileSystem FileSys... |
<<<<<<<
/// <summary>
/// Initializes a new instance of the <see cref="ChannelManager"/> class.
/// </summary>
/// <param name="userManager">The user manager.</param>
/// <param name="dtoService">The dto service.</param>
/// <param name="libraryManager">The library manage... |
<<<<<<<
ILoggerFactory loggerFactory,
IAssemblyInfo assemblyInfo,
ILocalizationManager localization)
=======
ILoggerFactory loggerFactory)
>>>>>>>
ILoggerFactory loggerFactory,
ILocalizationManager localization)
<<<<<<<
_typeMapper ... |
<<<<<<<
using Jellyfin.Data.Entities;
=======
#pragma warning disable CS1591
>>>>>>>
#pragma warning disable CS1591
using Jellyfin.Data.Entities; |
<<<<<<<
using MediaBrowser.Model.Querying;
=======
using MediaBrowser.Model.Entities;
>>>>>>>
using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Entities;
<<<<<<<
/// <summary>
/// Gets the filters.
/// </summary>
/// <param name="filters">The filter string.</param>
... |
<<<<<<<
using Jellyfin.Api.TypeConverters;
using Jellyfin.Networking.Configuration;
=======
>>>>>>>
using Jellyfin.Networking.Configuration; |
<<<<<<<
[HttpGet("{serverId}/ContentDirectory.xml", Name = "GetContentDirectory_2")]
[Produces(MediaTypeNames.Text.Xml)]
=======
[HttpGet("{serverId}/ContentDirectory/ContentDirectory", Name = "GetContentDirectory_2")]
[HttpGet("{serverId}/ContentDirectory/ContentDirectory.xml", Name =... |
<<<<<<<
=======
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Querying;
>>>>>>>
using MediaBrowser.Model.Querying;
<<<<<<<
=======
/// <summary>
/// Gets the item fields.
/// </summary>
/// <param name="fields">The fields string.</param>
/// <returns>IEnumera... |
<<<<<<<
var videoCodec = _encodingHelper.GetVideoEncoder(state, _encodingOptions);
var threads = _encodingHelper.GetNumberOfThreads(state, _encodingOptions, videoCodec);
=======
var videoCodec = _encodingHelper.GetVideoEncoder(state, encodingOptions);
var threads = Enc... |
<<<<<<<
public async Task<ActionResult> GetRemoteSubtitles([FromRoute, Required] string id)
=======
[ProducesFile("text/*")]
public async Task<ActionResult> GetRemoteSubtitles([FromRoute, Required] string? id)
>>>>>>>
[ProducesFile("text/*")]
public async Task<ActionResult> Ge... |
<<<<<<<
[HttpGet("{serverId}/ContentDirectory.xml", Name = "GetContentDirectory_2")]
[Produces(MediaTypeNames.Text.Xml)]
[ProducesFile(MediaTypeNames.Text.Xml)]
=======
[HttpGet("{serverId}/ContentDirectory/ContentDirectory", Name = "GetContentDirectory_2")]
[HttpGet("{serverId... |
<<<<<<<
try
{
chapter.ImageTag = ImageProcessor.GetImageCacheTag(item, chapter);
}
catch (Exception ex)
{
Logger.LogError(ex, "Failed to create image cache tag.");
... |
<<<<<<<
/// <summary>
=======
// private static long m_lTicks2PowLess1s = 0;
>>>>>>>
/// <summary>
// private static long m_lTicks2PowLess1s = 0;
<<<<<<<
/// Pack a <c>DateTime</c> object into 5 bytes. Layout: 2 zero bits,
DateTime dtRoot = (new DateTime(1970, 1, 1, 0, 0, 0, 0,
DateTimeKind.Ut... |
<<<<<<<
byte[] Print2DCode(TwoDimensionCodeType type, string data, Size2DCode size = Size2DCode.NORMAL, CorrectionLevel2DCode correction = CorrectionLevel2DCode.PERCENT_7);
=======
>>>>>>>
byte[] Print2DCode(TwoDimensionCodeType type, string data, Size2DCode size = Size2DCode.NORMAL, CorrectionLeve... |
<<<<<<<
// Specify name of the output file for the current page.
args.PageFileName = string.Format(ArtifactsDir + "SavingCallback.PageFileName.Page_{0}.html", args.PageIndex);
=======
// Specify name of the output file for the current page
args.PageFileN... |
<<<<<<<
[Test]
public void FieldSymbol()
{
//ExStart
//ExFor:FieldSymbol
//ExFor:FieldSymbol.CharacterCode
//ExFor:FieldSymbol.DontAffectsLineSpacing
//ExFor:FieldSymbol.FontName
//ExFor:FieldSymbol.FontSize
//E... |
<<<<<<<
[Test]
public void DocumentHasSmartArtObject()
{
//ExStart
//ExFor:Shape.HasSmartArt
//ExSummary:Shows how to detect that Shape has a SmartArt object.
Document doc = new Document(MyDir + "Shape.SmartArt.docx");
int count = 0;... |
<<<<<<<
[Test]
public void ResolveFontsBeforeLoadingDocument()
{
//ExStart
//ExFor:LoadOptions.FontSettings
//ExSummary:Shows how to resolve fonts before loading HTML and SVG documents.
FontSettings fontSettings = new FontSettings();
T... |
<<<<<<<
// Convert the document to any format supported by Aspose.Words.
doc.Save(ArtifactsDir + "Document.OpenDocumentFromWeb.docx");
=======
// Convert the document to any format supported by Aspose.Words
doc.Save(ArtifactsDir + "Docume... |
<<<<<<<
[Test]
public void InsertAtMailMerge()
=======
//ExStart
//ExFor:CompositeNode.HasChildNodes
//ExSummary:Demonstrates how to use the InsertDocument method to insert a document into a merge field during mail merge.
[Test] //ExSkip
public void InsertDocume... |
<<<<<<<
[Test]
public void InsertHtml()
=======
//ExStart
//ExFor:DocumentBuilder.InsertHtml(String)
//ExFor:MailMerge.FieldMergingCallback
//ExFor:IFieldMergingCallback
//ExFor:FieldMergingArgs
//ExFor:FieldMergingArgsBase
//ExFor:FieldMergingAr... |
<<<<<<<
/// <summary>
/// Range of status allowed if empty use default behavior
/// </summary>
public HttpStatusRanges HttpStatusCodeAllowed { get; private set; }
=======
/// <summary>
/// Gets or set the handler used when HttpException will be throw (can be used to t... |
<<<<<<<
public string InteractiveGdbHost { get; set; }
=======
public string RepositoryUrl { get; set; }
>>>>>>>
public string RepositoryUrl { get; set; }
public string InteractiveGdbHost { get; set; } |
<<<<<<<
case AddStmt addStmt:
unavailable = ProcessExpr(unavailable, addStmt.Variable);
unavailable = ProcessExpr(unavailable, addStmt.Value);
break;
=======
>>>>>>>
case AddStmt addStmt:
unavailable = P... |
<<<<<<<
case SetType setType:
var setElementTypeName = WriteTypeDefinition(output, setType.ElementType);
var setTypeDeclName = context.Names.GetTemporaryName("SETTYPE");
context.WriteLine(output,
$"static PRT_SETTYPE {se... |
<<<<<<<
using Plang.Compiler.Backend.C;
using Plang.Compiler.Backend.CSharp;
=======
using Plang.Compiler.Backend.Prt;
using Plang.Compiler.Backend.Coyote;
using Plang.Compiler.Backend.Rvm;
>>>>>>>
using Plang.Compiler.Backend.C;
using Plang.Compiler.Backend.CSharp;
using Plang.Compiler.Backend.Rvm;
<<<<<<<
... |
<<<<<<<
=======
/// <summary>
/// If a config value is an empty string we return null, this is to keep
/// backward compatibility with old code
/// </summary>
public static string GetConfigValue(string value)
{
return string.IsNullOrEmpty(value) ? null : value.Trim();
}
>>>>>>> |
<<<<<<<
// this.Logger.AddDebugMessage("Total Length Data=" + Length + " RX: " + receive.ToHex());
=======
// this.Logger.AddDebugMessage("Total Length Data=" + Length + " RX: " + receive.ToHex());
>>>>>>>
// this.Logger.AddDebugMessage("Total Length Data=" + Length... |
<<<<<<<
=======
static readonly ILogger log = LogManager.ForContext<ConnectionManager>();
readonly IVSGitServices vsGitServices;
>>>>>>>
static readonly ILogger log = LogManager.ForContext<ConnectionManager>(); |
<<<<<<<
"GitHub.VisualStudio",
"System.Windows.Interactivity"
=======
"GitHub.VisualStudio",
"GitHub.TeamFoundation",
"GitHub.TeamFoundation.14",
"GitHub.TeamFoundation.15"
>>>>>>>
"GitHub.VisualStudio",
"GitHub.TeamFound... |
<<<<<<<
var target = new LoginManager(keychain, tfa, oauthListener, "id", "secret");
=======
var target = new LoginManager(keychain, tfa, "id", "secret", scopes);
>>>>>>>
var target = new LoginManager(keychain, tfa, oauthListener, "id", "secret", scopes);
<<<<<<<
var ... |
<<<<<<<
machine.Configure(UIViewType.Clone)
.OnEntry(() =>
{
RunView(UIViewType.Clone);
})
.Permit(Trigger.Cancel, UIViewType.End)
.Permit(Trigger.Next, UIViewType.End);
machine.Configure(UIViewT... |
<<<<<<<
public const int createGistCommand = 0x400;
=======
public const int openLinkCommand = 0x100;
public const int copyLinkCommand = 0x101;
>>>>>>>
public const int createGistCommand = 0x400;
public const int openLinkCommand = 0x100;
public const int copyLinkComman... |
<<<<<<<
Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de>
=======
Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
>>>>>>>
Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
<<<<<<<
private Stream m_sBaseStream;
private bool m_bWriting;
=======
pri... |
<<<<<<<
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1300:SpecifyMessageBoxOptions")]
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals")]
=======
>>>>>>>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Mi... |
<<<<<<<
//IObservable<object> Transition { get; }
IObservable<IView> SelectFlow(UIControllerFlow choice);
=======
IObservable<UserControl> SelectFlow(UIControllerFlow choice);
/// <summary>
/// Allows listening to the completion state of the ui flow - whether
/// it was... |
<<<<<<<
private async Task<LastCommitAdapter> GetPullRequestLastCommitAdapter(HostAddress address, string owner, string name, int number)
{
if(readCommitStatuses == null)
{
readCommitStatuses = new Query()
.Repository(Var(nameof(owner)), Var(nameof... |
<<<<<<<
Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de>
Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll
=======
Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
>>>>>>>
Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-onl... |
<<<<<<<
public InlineAnnotationModel(CheckSuiteModel checkSuite, CheckRunModel checkRun,
CheckRunAnnotationModel annotation)
=======
/// <summary>
/// Initializes the <see cref="InlineAnnotationModel"/>.
/// </summary>
/// <param name="checkRun">The check run model.... |
<<<<<<<
/// <inheritdoc/>
public ILocalRepositoryModel LocalRepository { get; private set; }
=======
/// <summary>
/// Gets the local repository.
/// </summary>
public LocalRepositoryModel LocalRepository { get; private set; }
>>>>>>>
/// <inheritdoc/>
... |
<<<<<<<
using Rothko;
using Serilog;
using Environment = System.Environment;
=======
using System.ComponentModel.Design;
using GitHub.ViewModels;
>>>>>>>
using Rothko;
using Serilog;
using Environment = System.Environment;
using System.ComponentModel.Design;
using GitHub.ViewModels; |
<<<<<<<
if ((packageSettings?.ForkButton ?? false) && await IsAGitHubDotComRepo(ActiveRepoUri))
=======
if (await IsAGitHubDotComRepo())
>>>>>>>
if (await IsAGitHubDotComRepo(ActiveRepoUri)) |
<<<<<<<
return new RepositoryCreationViewModel(repositoryHost, os, creationService);
=======
return new RepositoryCreationViewModel(repositoryHost, os, creationService, avatarProvider, usageTracker);
>>>>>>>
return new RepositoryCreationViewModel(repositoryHost, os, creationService, usageTrac... |
<<<<<<<
void ActivityLogMessage(string message);
void ActivityLogWarning(string message);
void ActivityLogError(string message);
=======
void ClearNotifications();
>>>>>>>
void ClearNotifications();
void ActivityLogMessage(string message);
void ActivityLogWar... |
<<<<<<<
=======
using GitHub.Models;
using GitHub.Exports;
>>>>>>>
using GitHub.Models;
using GitHub.Exports;
<<<<<<<
using NullGuard;
using Serilog;
using Serilog.Core;
using Log = GitHub.Infrastructure.Log;
=======
using NLog;
>>>>>>>
<<<<<<<
=======
using System.Threading.Tasks;
using GitHub.Extensions;
>... |
<<<<<<<
using GitHub.Settings;
=======
using GitHub.Services.Vssdk.Commands;
>>>>>>>
using GitHub.Settings;
using GitHub.Services.Vssdk.Commands;
<<<<<<<
using GitHub.VisualStudio.Menus;
using GitHub.VisualStudio.Settings;
=======
>>>>>>>
using GitHub.VisualStudio.Settings;
<<<<<<<
var ... |
<<<<<<<
using Serilog;
=======
>>>>>>>
using Serilog;
<<<<<<<
static readonly ILogger log = LogManager.ForContext<InlineCommentTagger>();
=======
static readonly IReadOnlyList<ITagSpan<InlineCommentTag>> EmptyTags = new ITagSpan<InlineCommentTag>[0];
>>>>>>>
static readonly ILogger log... |
<<<<<<<
catch (Exception e) {
Kp2aLog.Log("Exception: " + e);
=======
catch (AggregateException e)
{
string message = e.Message;
foreach (var innerException in e.InnerExceptions)
{
message = innerException.Message; // Override the message shown with the last (hopefully most recent) inner... |
<<<<<<<
public PullRequestAnnotationItemViewModel(CheckSuiteModel checkSuite,
CheckRunModel checkRun,
CheckRunAnnotationModel annotation,
IPullRequestSession session,
IPullRequestEditorService editorService)
=======
/// <summary>
/// Initializes... |
<<<<<<<
Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de>
=======
Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de>
>>>>>>>
Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de>
<<<<<<<
#if KeePassRT
using Org.BouncyCastle.Crypto.Engines;
using Org.BouncyCastl... |
<<<<<<<
using NullGuard;
=======
using NLog;
>>>>>>>
<<<<<<<
IsLoading = true;
Repositories = repositoryHost.ModelService.GetRepositories(repositories) as TrackingCollection<IRemoteRepositoryModel>;
repositories.OriginalCompleted.Subscribe(
_ => { }
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.