conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
private fileIsAppointment (file: IAppointment|IForm|IQuillDelta|IWallet|File) : boolean {
=======
private fileIsAppointment (file: IAppointment|IEhrApiKey|IForm|IQuillDelta|File) : boolean {
>>>>>>>
private fileIsAppointment (file: IAppointment|IEhrApiKey|IForm|IQuillDelta|IWallet|File) : boolean {
<<<<<... |
<<<<<<<
this.routerService.navigate(['account', 'messages', username]);
=======
this.router.navigate(['account', 'chat', username]);
>>>>>>>
this.router.navigate(['account', 'messages', username]); |
<<<<<<<
private setEventSubscription(name: Array<string>, status: string) {
=======
public getExplicitHostParam(): string {
return this.getHostParam() || '';
}
private setEventSubscription(name: string, status: string) {
>>>>>>>
public getExplicitHostParam(): string {
return this... |
<<<<<<<
public importShares(volumeId) {
return this.volumeDao.importShares(volumeId);
}
public updateVolumeTopology(volume: any, topology: any) {
=======
public updateVolumeTopology(volume: Volume, topology: ZfsTopology) {
>>>>>>>
public importShares(volumeId) {
return this.volum... |
<<<<<<<
<input id="other_shell" type="text" class="form-control" :disabled="useDefaultShell===1" v-model="shell">
<div v-if="shellErrorMsg != ''" class="text-center"><i class="fas fa-exclamation-triangle"></i> {{ shellErrorMsg }}</div>
=======
<input id="other_shell" class="form-control" :disabled="... |
<<<<<<<
try {
return (await Gopass.execute(`history ${key}`))
.split(lineSplitRegex)
.filter(isDefined)
.map(historyLine => {
const lineSplit = historyLine.split(' - ')
return {
hash: lin... |
<<<<<<<
function convertObjectToKey (this: Model<DocumentCarrier>, key: InputKey): KeyObject {
let keyObject: KeyObject;
const hashKey = this.getHashKey();
if (typeof key === "object") {
const rangeKey = this.getRangeKey();
keyObject = {
[hashKey]: key[hashKey]
};
if (rangeKey && key[rangeKey]) {
keyOb... |
<<<<<<<
import { DynamoDB, AWSError } from "aws-sdk";
import { ValueType } from "./Schema";
import { CallbackType, ObjectType } from "./General";
import { PopulateDocument, PopulateSettings } from "./Populate";
=======
import {DynamoDB, AWSError} from "aws-sdk";
import {ValueType} from "./Schema";
import {CallbackTyp... |
<<<<<<<
import { DynamoDB } from "aws-sdk";
import { ModelType } from "./General";
=======
import {DynamoDB} from "aws-sdk";
>>>>>>>
import {DynamoDB} from "aws-sdk";
import {ModelType} from "./General";
<<<<<<<
"isOfType": this.jsType.func ? this.jsType.func : ((val): {value: ValueType; type: string} => {
r... |
<<<<<<<
batchPut(items: DataSchema[], options?: PutOptions, callback?: (err: Error, items: Model[]) => void): Promise<Model[]>;
batchPut(items: DataSchema[], callback?: (err: Error, items: Model[]) => void): Promise<Model[]>;
create(item: DataSchema, options?: PutOptions, callback?: (err: Error, model: Mod... |
<<<<<<<
export function ddb(): typeof _AWS.DynamoDB;
export function setDocumentClient(documentClient: _AWS.DynamoDB.DocumentClient): void;
=======
export function ddb(): _AWS.DynamoDB;
>>>>>>>
export function ddb(): _AWS.DynamoDB;
export function setDocumentClient(documentClient: _AWS.DynamoDB.DocumentCli... |
<<<<<<<
// Types
import { AuthCallback } from "../types/AuthCallback";
=======
import { BrowserAuthError } from "../error/BrowserAuthError";
import { BrowserUtils } from "../utils/BrowserUtils";
/**
* A type alias for an authResponseCallback function.
* {@link (authResponseCallback:type)}
* @param authErr error c... |
<<<<<<<
import { RouterlessTracking } from './routing/routerless';
=======
import {
advance,
createRoot,
createRootWithRouter,
RootCmp,
RoutesConfig,
TestModule,
} from '../test.mocks';
>>>>>>>
import {
advance,
createRoot,
createRootWithRouter,
RootCmp,
RoutesConfig,
TestModule,
} from '../t... |
<<<<<<<
expect(EventSpy).toHaveBeenCalledWith({ path: '/sections/123/pages/456' });
=======
expect(EventSpy).toHaveBeenCalledWith({ path: '/sections/01234567-9ABC-DEF0-1234-56789ABCDEF0/pages/456', location: location });
>>>>>>>
expect(EventSpy).toHaveBeenCalledWith({
path: ... |
<<<<<<<
const CommandActionExecutor = require('@oracle/suitecloud-cli/src/core/CommandActionExecutor');
const CommandOptionsValidator = require('@oracle/suitecloud-cli/src/core/CommandOptionsValidator');
const CLIConfigurationService = require('@oracle/suitecloud-cli/src/core/extensibility/CLIConfigurationService');
c... |
<<<<<<<
audio: WebAudio;
=======
audioOnly: boolean;
>>>>>>>
audio: WebAudio;
audioOnly: boolean;
<<<<<<<
mutePage: boolean;
=======
iframe: boolean;
lastSubtitle: string;
muted: boolean;
mutePage: boolean;
subtitleSelector: string;
>>>>>>>
iframe: boolean;
mutePage: boolean;
<<<<<<<
y... |
<<<<<<<
return function *orchestrator(): Operation {
let orchestrator = yield ({ resume, context: { parent }}) => resume(parent);
=======
return function *orchestrator(): Sequence {
let orchestrator = this; // eslint-disable-line @typescript-eslint/no-this-alias
let state = new State();
>>>>>>>
ret... |
<<<<<<<
* @param {string} options.fallbackLocale One locale from options.locales to use if a key is not found in the current locale
=======
* @param {boolean} options.escapeHtml To escape html. Default value is true.
>>>>>>>
* @param {string} options.fallbackLocale One locale from options.locales to u... |
<<<<<<<
import { ListOfSnapshotsComponent } from './components/snapshots/list-of-snapshots/list-of-snapshots.component';
import { DateFilter } from './filters/dateFilter.pipe';
import { NameFilter } from './filters/nameFilter.pipe';
=======
import { CustomAdaptersComponent } from './components/preferences/common/cust... |
<<<<<<<
public onTextAdded(evt: TextAddedDataEvent) {
this.resetDrawToolChoice();
let drawing = this.getDrawingMock("text", evt.savedText);
(drawing.element as TextElement).text = evt.savedText;
let svgText = this.mapDrawingToSvgConverter.convert(drawing);
this.drawingService
.add(this.ser... |
<<<<<<<
import { PopTokenGenerator } from "../crypto/PopTokenGenerator";
=======
import { RequestThumbprint } from "../network/RequestThumbprint";
>>>>>>>
import { PopTokenGenerator } from "../crypto/PopTokenGenerator";
import { RequestThumbprint } from "../network/RequestThumbprint";
<<<<<<<
const requestB... |
<<<<<<<
maxHeight: '600px',
autoFocus: false
=======
autoFocus: false,
disableClose: true
>>>>>>>
maxHeight: '600px',
autoFocus: false,
disableClose: true |
<<<<<<<
getConfiguration(server: Server, node: Node) {
return of('sample config');
}
saveConfiguration(server: Server, node: Node, configuration: string) {
return of(configuration);
}
=======
update(server: Server, node: Node) {
return of(node);
}
>>>>>>>
getConfiguration(server: Serv... |
<<<<<<<
import { ConsoleDeviceActionComponent } from './components/project-map/context-menu/actions/console-device-action/console-device-action.component';
import { ConsoleComponent } from './components/settings/console/console.component';
=======
import { NodesMenuComponent } from './components/project-map/nodes-men... |
<<<<<<<
import { MapScaleService } from '../../services/mapScale.service';
=======
import { NodeCreatedLabelStylesFixer } from './helpers/node-created-label-styles-fixer';
>>>>>>>
import { MapScaleService } from '../../services/mapScale.service';
import { NodeCreatedLabelStylesFixer } from './helpers/node-created-la... |
<<<<<<<
import { DuplicateActionComponent } from './components/project-map/context-menu/actions/duplicate-action/duplicate-action.component';
=======
import { HelpComponent } from './components/help/help.component';
>>>>>>>
import { DuplicateActionComponent } from './components/project-map/context-menu/actions/dupli... |
<<<<<<<
import { ShowNodeActionComponent } from './components/project-map/context-menu/actions/show-node-action/show-node-action.component';
import { InfoDialogComponent } from './components/project-map/info-dialog/info-dialog.component';
import { InfoService } from './services/info.service';
=======
import { BringTo... |
<<<<<<<
import { Label } from '../../../../cartography/models/label';
import { NodeService } from '../../../../services/node.service';
import { Node } from '../../../../cartography/models/node';
import { NodesDataSource } from '../../../../cartography/datasources/nodes-datasource';
import { Link } from '../../../../mod... |
<<<<<<<
import { SaveProjectDialogComponent } from './components/projects/save-project-dialog/save-project-dialog.component';
=======
import { BringToFrontActionComponent } from './components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component';
>>>>>>>
import { SaveProjectDialogCo... |
<<<<<<<
import { ServersComponent } from './components/servers/servers.component';
import { ProjectsComponent } from './components/projects/projects.component';
import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component';
import { SettingsComponent } from './components/settings/settings.c... |
<<<<<<<
import {
MatButtonModule,
MatCardModule,
MatMenuModule,
MatToolbarModule,
MatStepperModule,
MatIconModule,
MatFormFieldModule,
MatInputModule,
MatTableModule,
MatDialogModule,
MatProgressBarModule,
MatProgressSpinnerModule,
MatSnackBarModule,
MatCheckboxModule,
MatListModule,
Mat... |
<<<<<<<
getStatistics(server: Server, project_id: string): Observable<any> {
return this.httpServer.get(server, `/projects/${project_id}/stats`);
}
=======
duplicate(server: Server, project_id: string, project_name): Observable<any> {
return this.httpServer.post(server, `/projects/${project_id}/duplica... |
<<<<<<<
import { SaveProjectDialogComponent } from './components/projects/save-project-dialog/save-project-dialog.component';
=======
import { ShowNodeActionComponent } from './components/project-map/context-menu/actions/show-node-action/show-node-action.component';
import { InfoDialogComponent } from './components/p... |
<<<<<<<
import { SaveProjectDialogComponent } from './components/projects/save-project-dialog/save-project-dialog.component';
=======
import { TopologySummaryComponent } from './components/topology-summary/topology-summary.component';
>>>>>>>
import { SaveProjectDialogComponent } from './components/projects/save-pro... |
<<<<<<<
import { MapScaleService } from './services/mapScale.service';
=======
import { AdbutlerComponent } from './components/adbutler/adbutler.component';
import { ConsoleService } from './services/settings/console.service';
import { DefaultConsoleService } from './services/settings/default-console.service';
import... |
<<<<<<<
import { MapSettingService } from './services/mapsettings.service';
=======
import { HelpComponent } from './components/help/help.component';
>>>>>>>
import { MapSettingService } from './services/mapsettings.service';
import { HelpComponent } from './components/help/help.component'; |
<<<<<<<
import { DrawLinkToolComponent } from './components/draw-link-tool/draw-link-tool.component';
import { DrawingResizingComponent } from './components/drawing-resizing/drawing-resizing.component';
=======
>>>>>>>
import { DrawingResizingComponent } from './components/drawing-resizing/drawing-resizing.componen... |
<<<<<<<
stocks$: Observable<StockMarketState> = this.store.pipe(
select(selectStockMarket)
);
=======
routeAnimationsElements = ROUTE_ANIMATIONS_ELEMENTS;
initialized;
stocks;
>>>>>>>
stocks$: Observable<StockMarketState> = this.store.pipe(
select(selectStockMarket)
);
routeAnimationsElements... |
<<<<<<<
=======
import { Child, Context, Index, Lexeme, Parent, Path } from '../types'
import { State } from './initialState'
>>>>>>>
<<<<<<<
import { Child, Context, Lexeme, Parent, Path, Timestamp } from '../types'
import { GenericObject } from '../utilTypes'
import { Block } from '../action-creators/importText'
... |
<<<<<<<
/** Get the value of the Child | ThoughtContext. */
const childValue = (child: Child | ThoughtContext) => showContexts
? head((child as ThoughtContext).context)
: (child as Child).value
const thoughtsRanked = !path || path.length === 0 ? RANKED_ROOT
=======
const simplePath = !path || path.le... |
<<<<<<<
export default (state: State, path: Nullable<Path>, contextChain: Child[][] = [], { depth = 0 }: { depth?: number } = {}): GenericObject<Path> => {
=======
const expandThoughts = (state: State, path: Path | null, contextChain: Child[][] = [], { depth = 0 }: { depth?: number } = {}): GenericObject<boolean> => ... |
<<<<<<<
import { State, ThoughtsInterface, initialState } from '../util/initialState'
import { decodeThoughtsUrl, expandThoughts } from '../selectors'
import { hashContext, importHtml, isRoot, logWithTime, mergeUpdates, reducerFlow } from '../util'
import { CONTEXT_CACHE_SIZE, EM_TOKEN, INITIAL_SETTINGS, ROOT_TOKEN, TH... |
<<<<<<<
import { ImportJSONOptions, importJSON } from './importJSON'
=======
import { importJSON } from './importJSON'
import { State } from './initialState'
import { SimplePath } from '../types'
interface ImportHtmlOptions {
skipRoot? : boolean,
}
>>>>>>>
import { ImportJSONOptions, importJSON } from './importJS... |
<<<<<<<
import { appendChildPath, getChildPath, getSortPreference, getThought, hasChild } from '../selectors'
import { compareByRank, compareThought, hashContext, isFunction, sort, unroot, pathToContext, equalThoughtRanked, head } from '../util'
import { Child, ComparatorFunction, Context, ContextHash, ThoughtContext, ... |
<<<<<<<
import { ActionCreator, Path, Timestamp } from '../types'
=======
import { simplifyPath } from '../selectors'
import { ActionCreator, Path } from '../types'
>>>>>>>
import { ActionCreator, Path, Timestamp } from '../types'
import { simplifyPath } from '../selectors'
<<<<<<<
const importText = (thoughtsRanke... |
<<<<<<<
import { Alert, Context, Lexeme, Parent, Patch, Path, Snapshot } from '../types'
import { GenericObject, Nullable } from '../utilTypes'
=======
>>>>>>>
<<<<<<<
contextIndex: GenericObject<Parent>,
contextCache: string[],
thoughtIndex: GenericObject<Lexeme>,
thoughtCache: string[],
=======
though... |
<<<<<<<
import { getThoughtsRanked } from '../selectors'
=======
import { getChildrenRanked } from '../selectors'
import { Context } from '../types'
>>>>>>>
import { getChildrenRanked } from '../selectors'
<<<<<<<
const getStateSetting = (state: State, context: Context | string): string | undefined =>
(getThought... |
<<<<<<<
import { expect } from 'chai';
import { replicate, range, cycle, repeat } from '../src';
import { iterResult, iterDone } from './utility';
=======
import { assert, expect } from 'chai';
import { range, replicate } from '../src';
import { iterDone, iterResult } from './utility';
>>>>>>>
import { assert, expec... |
<<<<<<<
function repeat(item: number | string | IterableProtocol): IterableProtocol {
if (validateInputTypes(item)) {
=======
function repeat(
item: number | string | Function | IterableProtocol
): IterableProtocol {
if (
typeof item !== 'number' &&
typeof item !== 'string' &&
type... |
<<<<<<<
import { LoadInitiationAction, LoadSuccessAction, LoadFailureAction, LoadCancelAction, DefaultAction} from './actions';
=======
import {
LoadInitiationAction,
LoadSuccessAction,
LoadFailureAction,
LoadCancelAction,
ClearErrorAction,
} from './actions';
>>>>>>>
import {
LoadInitiationAction,
Loa... |
<<<<<<<
import Hero from './Hero';
import Button from './Button';
import Article from './Article';
import Footer from './Footer';
import Paragraph from './Paragraph';
import SvgIcon from './SvgIcon';
import Anchor from './Anchor';
import Markdown from './Markdown';
import Headline from './Headline';
import LoadingIndic... |
<<<<<<<
'typings/main.d.ts',
join(APP_SRC, '**/*.ts'),
'!' + join(APP_SRC, '**/*.e2e.ts'),
'!' + join(APP_SRC, 'main.ts')
];
=======
join(APP_SRC, '**/*.ts'),
'!' + join(APP_SRC, `${BOOTSTRAP_MODULE}.ts`)
];
>>>>>>>
'typings/main.d.ts',
... |
<<<<<<<
}
export interface PageResponse {
offset: number;
length: number;
total:number;
exact: boolean;
}
export enum DataStatus {
UNLOCKED= "Unlocked",
LOCKED="Locked",
DELETED="Deleted";
}
export interface DataItem {
id: number;
feedName:string;
typeName:string;
pipelineUuid: string;
pa... |
<<<<<<<
Rider = 'Rider',
=======
AndroidStudio = 'Android Studio',
>>>>>>>
AndroidStudio = 'Android Studio',
Rider = 'Rider',
<<<<<<<
if (label === ExternalEditor.Rider) {
return ExternalEditor.Rider
}
=======
if (label === ExternalEditor.AndroidStudio) {
return ExternalEditor.AndroidStudio
... |
<<<<<<<
formState: {
kind: HistoryTabMode.History,
},
=======
formState: { kind: ComparisonView.None },
tip: null,
>>>>>>>
formState: {
kind: HistoryTabMode.History,
},
tip: null, |
<<<<<<<
const args = [...gitNetworkArguments, 'lfs', 'clone', '--recursive']
=======
const args = [
...gitNetworkArguments,
'lfs',
'clone',
'--recursive',
'--progress',
// git-lfs will create the hooks it requires by default
// and we don't know if the repository is LFS enabled
// ... |
<<<<<<<
import moment = require('moment')
=======
import { MenuLabelsEvent } from '../../models/menu-labels'
>>>>>>>
import moment = require('moment')
import { MenuLabelsEvent } from '../../models/menu-labels'
<<<<<<<
private async updateStashEntryCountMetric(
repository: Repository,
gitStore: GitStore
... |
<<<<<<<
/** Clear the contextual commit message. */
public clearContextualCommitMessage(): Promise<void> {
this._contextualCommitMessage = null
this.emitUpdate()
return Promise.resolve()
}
=======
>>>>>>> |
<<<<<<<
}
/** Should the app check and warn the user about committing large files? */
export function enableFileSizeWarningCheck(): boolean {
return enableDevelopmentFeatures()
=======
}
/** Should the app use the MergeConflictsDialog component and flow? */
export function enableMergeConflictsDialog(): boolean {
... |
<<<<<<<
label: __DARWIN__ ? 'Compare on GitHub' : 'Compare on &GitHub',
id: 'compare-branch-github',
=======
label: __DARWIN__ ? 'Compare on GitHub' : '&Compare on GitHub',
id: 'compare-on-github',
>>>>>>>
label: __DARWIN__ ? 'Compare on GitHub' : 'Compare on &GitHub',
... |
<<<<<<<
/** This shouldn't be called directly. See `Dispatcher`. */
public _openShell(path: string) {
return openShell(path)
}
=======
/** This shouldn't be called directly. See `Dispatcher`. */
public async _setGitIgnoreText(repository: Repository, text: string): Promise<void> {
const gitStore = ... |
<<<<<<<
describe('cherry picking with conflicts', () => {
beforeEach(async () => {
// In the 'git/cherry-pick' `beforeEach`, we call `createRepository` which
// adds a commit to the feature branch with a file called THING.md. In
// order to make a conflict, we will add the same file to the targ... |
<<<<<<<
import { inferComparisonBranch } from './helpers/infer-comparison-branch'
import { ApplicationTheme, getThemeName } from '../../ui/lib/application-theme'
=======
import {
ApplicationTheme,
getPersistedTheme,
setPersistedTheme,
} from '../../ui/lib/application-theme'
>>>>>>>
import { inferComparisonBran... |
<<<<<<<
private _contextualCommitMessage: ICommitMessage | null = null
private _aheadBehind: IAheadBehind | null = null
private _remoteName: string | null = null
=======
private _commitMessage: ICommitMessage | null
private _contextualCommitMessage: ICommitMessage | null
>>>>>>>
private _commitMessage:... |
<<<<<<<
RenameBranch,
=======
DeleteBranch,
>>>>>>>
RenameBranch,
DeleteBranch, |
<<<<<<<
/** End the Welcome flow. */
public endWelcomeFlow(): Promise<void> {
return this.appStore._endWelcomeFlow()
}
=======
/**
* Set the commit summary and description for a work-in-progress
* commit in the changes view for a particular repository.
*/
public setCommitMessage(repository: R... |
<<<<<<<
/**
* Set the width of the repository sidebar to the given
* value. This affects the changes and history sidebar
* as well as the first toolbar section which contains
* repo selection on all platforms and repo selection and
* app menu on Windows.
*/
public setSidebarWidth(width: number): ... |
<<<<<<<
RenameBranch,
=======
PublishRepository,
>>>>>>>
RenameBranch,
PublishRepository, |
<<<<<<<
import { remote, shell } from 'electron'
=======
import { ipcRenderer, remote } from 'electron'
>>>>>>>
import { remote } from 'electron'
<<<<<<<
=======
import { uuid } from '../uuid'
import { shell } from './app-shell'
>>>>>>>
import { shell } from './app-shell' |
<<<<<<<
TextMate = 'TextMate',
=======
RubyMine = 'RubyMine',
>>>>>>>
RubyMine = 'RubyMine',
TextMate = 'TextMate',
<<<<<<<
if (label === ExternalEditor.TextMate) {
return ExternalEditor.TextMate
}
=======
if (label === ExternalEditor.RubyMine) {
return ExternalEditor.RubyMine
}
>>>>>>>
... |
<<<<<<<
| CommitsChosenStep
=======
| HideConflictsStep
>>>>>>>
| CommitsChosenStep
| HideConflictsStep
<<<<<<<
}
/**
* Shape of data for when a user has chosen commits to cherry pick but not yet
* selected a target branch.
*/
export type CommitsChosenStep = {
readonly kind: CherryPickStepKind.Commits... |
<<<<<<<
import { enableCompareSidebar, enableRepoInfoIndicators } from '../feature-flag'
=======
import { enableCompareSidebar } from '../feature-flag'
import {
ApplicationTheme,
getPersistedTheme,
setPersistedTheme,
} from '../../ui/lib/application-theme'
>>>>>>>
import { enableCompareSidebar, enableRepoInfoI... |
<<<<<<<
branchComparisons: 0,
defaultBranchComparisons: 0,
mergesInitiatedFromComparison: 0,
updateFromDefaultBranchMenuCount: 0,
mergeIntoCurrentBranchMenuCount: 0,
=======
prBranchCheckouts: 0,
>>>>>>>
branchComparisons: 0,
defaultBranchComparisons: 0,
mergesInitiatedFromComparison: 0,
updateFr... |
<<<<<<<
const user = this.accounts.find(a => a.endpoint === repository.endpoint)
=======
const user = getUserForEndpoint(this.users, repository.endpoint)
>>>>>>>
const user = getAccountForEndpoint(this.accounts, repository.endpoint)
<<<<<<<
const fetcher = new BackgroundFetcher(repository, account, ... |
<<<<<<<
}
/**
* Handler for when we attempt to checkout a branch and there are some files that would
* be overwritten.
*/
export async function localChangesOverwrittenHandler(
error: Error,
dispatcher: Dispatcher
): Promise<Error | null> {
const e = asErrorWithMetadata(error)
if (!e) {
return error
}
... |
<<<<<<<
}
/** Should the app try and detect conflicts before the user stumbles into them? */
export function enableMergeConflictDetection(): boolean {
return enableDevelopmentFeatures()
=======
}
/** Should `git status` use --no-optional-locks to assist with concurrent usage */
export function enableStatusWithout... |
<<<<<<<
/** Merge the named branch into the current branch. */
public mergeBranch(repository: Repository, branch: string): Promise<void> {
return this.appStore._mergeBranch(repository, branch)
}
=======
/** Record the given launch stats. */
public recordLaunchStats(stats: ILaunchStats): Promise<void> ... |
<<<<<<<
About,
Acknowledgements,
=======
About,
PublishRepository,
>>>>>>>
About,
PublishRepository,
Acknowledgements,
<<<<<<<
{ type: PopupType.About } |
{ type: PopupType.Acknowledgements }
=======
{ type: PopupType.About } |
... |
<<<<<<<
}
/** Should the app detect Windows Subsystem for Linux as a valid shell? */
export function enableWSLDetection(): boolean {
return enableDevelopmentFeatures()
=======
}
/**
* Should the application warn the user when they are about to commit to a
* protected branch, and encourage them into a flow to mo... |
<<<<<<<
this.updateOrSelectFirstCommit(repository, commits)
return this.emitUpdate()
}
=======
this.updateCompareState(repository, () => ({
formState: {
kind: ComparisonView.None,
},
commitSHAs: commits,
}))
return this.emitUpdate()
>>>>>>>
... |
<<<<<<<
/** The number of times the users views a stash entry after checking out a branch */
readonly stashViewedAfterCheckoutCount: number
/** The number of times the user elects to stash changes on the current branch */
readonly stashCreatedOnCurrentBranchCount: number
/** The number of times the user e... |
<<<<<<<
const byline = require('byline')
=======
import { GitProcess, GitError, GitErrorCode } from 'git-kitchen-sink'
>>>>>>>
import { GitProcess, GitError, GitErrorCode } from 'git-kitchen-sink'
const byline = require('byline')
<<<<<<<
return GitProcess.exec([ 'clone', '--progress', '--', url, path ], __d... |
<<<<<<<
public async _updatePullRequests(repository: Repository): Promise<void> {
const gitHubRepository = repository.gitHubRepository
if (!gitHubRepository) {
return
}
const account = getAccountForEndpoint(
this.accounts,
gitHubRepository.endpoint
)
if (!account) {
r... |
<<<<<<<
public _clone(url: string, path: string, options: { user: User | null, branch?: string }): { promise: Promise<boolean>, repository: CloningRepository } {
const promise = this.cloningRepositoriesStore.clone(url, path, options)
const repository = this.cloningRepositoriesStore.repositories.find(r => r.ur... |
<<<<<<<
/** Opens a terminal window with path as the working directory */
public openShell(path: string) {
return this.appStore._openShell(path)
}
=======
/** Write the given rules to the gitignore file at the root of the repository. */
public setGitIgnoreText(repository: Repository, text: string): Pr... |
<<<<<<<
Rider = 'JetBrains Rider',
=======
NotepadPlusPlus = 'Notepad++',
>>>>>>>
NotepadPlusPlus = 'Notepad++',
Rider = 'JetBrains Rider',
<<<<<<<
if (label === ExternalEditor.Rider) {
return ExternalEditor.Rider
}
=======
if (label === ExternalEditor.NotepadPlusPlus) {
return ExternalEdito... |
<<<<<<<
import { enableCompareSidebar, enableRepoInfoIndicators } from '../feature-flag'
=======
import { enableCompareSidebar } from '../feature-flag'
import { inferComparisonBranch } from './helpers/infer-comparison-branch'
>>>>>>>
import { enableCompareSidebar, enableRepoInfoIndicators } from '../feature-flag'
im... |
<<<<<<<
return await ResponseHandler.generateAuthenticationResult(
this.cryptoUtils,
{
account: cachedAccount,
accessToken: cachedAccessToken,
idToken: cachedIdToken,
refreshToken: null
}, idTokenObject, true);
... |
<<<<<<<
import {
IAPIOrganization,
IAPIRefStatus,
IAPIRepository,
IAPIPullRequest,
} from '../../lib/api'
=======
import { IAPIOrganization, IAPIRepository } from '../../lib/api'
>>>>>>>
import {
IAPIOrganization,
IAPIRepository,
IAPIPullRequest,
} from '../../lib/api' |
<<<<<<<
import { TrustedAuthority } from "../authority/TrustedAuthority";
import { UnifiedCacheManager } from "../cache/UnifiedCacheManager";
import { AccountEntity } from "../cache/entities/AccountEntity";
import { IAccount } from "../account/IAccount";
import { AccountCache } from "../cache/utils/CacheTypes";
import ... |
<<<<<<<
ipcMain.on('log', (event: Electron.IpcMessageEvent, logEntry: ILogEntry) => {
log(logEntry)
=======
ipcMain.on('log', (event: Electron.IpcMainEvent, level: LogLevel, message: string) => {
writeLog(level, message)
>>>>>>>
ipcMain.on('log', (event: Electron.IpcMessageEvent, level: LogLevel, messa... |
<<<<<<<
import { assertNever } from '../fatal-error'
=======
import { EmojiStore } from './emoji-store'
import { GitStore, ICommitMessage } from './git-store'
import { assertNever, forceUnwrap } from '../fatal-error'
import { IssuesStore } from './issues-store'
>>>>>>>
import { assertNever, forceUnwrap } from '../fa... |
<<<<<<<
public async recordSuggestedStepOpenInExternalEditor(): Promise<void> {
this.statsStore.recordSuggestedStepOpenInExternalEditor()
}
public async recordSuggestedStepOpenWorkingDirectory(): Promise<void> {
this.statsStore.recordSuggestedStepOpenWorkingDirectory()
}
public async recordSuggeste... |
<<<<<<<
import {
installGlobalLFSFilters,
isUsingLFS,
installLFSHooks,
} from '../git/lfs'
=======
import { CloneRepositoryTab } from '../../models/clone-repository-tab'
>>>>>>>
import {
installGlobalLFSFilters,
isUsingLFS,
installLFSHooks,
} from '../git/lfs'
import { CloneRepositoryTab } from '../../mo... |
<<<<<<<
PublishBranch,
PushBranchCommits,
=======
CLIInstalled,
>>>>>>>
PushBranchCommits,
CLIInstalled,
<<<<<<<
| {
type: PopupType.PublishBranch
repository: Repository
branch: Branch
}
| {
type: PopupType.PushBranchCommits
repository: Repository
branch: Branch... |
<<<<<<<
ipcMain.on('proxy/request', (event: Electron.IpcMainEvent, { id, options }: { id: string, options: IHTTPRequest }) => {
if (network === null) {
// the network module can only be resolved after the app is ready
network = require('electron').net
if (network === null) {
sharedPro... |
<<<<<<<
/** Fetch the repository. */
public fetch(repository: Repository): Promise<void> {
return this.appStore.fetch(repository)
}
=======
/**
* Set the commit summary and description for a work-in-progress
* commit in the changes view for a particular repository.
*/
public setCommitMessage(... |
<<<<<<<
InstallGit,
About
=======
About,
PublishRepository,
>>>>>>>
About,
InstallGit,
PublishRepository,
<<<<<<<
{ type: PopupType.About } |
{ type: PopupType.InstallGit, path: string }
=======
{ type: PopupType.About } |
... |
<<<<<<<
import * as URL from 'url'
import {app, ipcMain} from 'electron'
=======
import {app, Menu} from 'electron'
>>>>>>>
import * as URL from 'url'
import {app, ipcMain, Menu} from 'electron'
<<<<<<<
import {requestToken, authenticate, setToken} from './auth'
=======
import {buildDefaultMenu} from './menu'
>>... |
<<<<<<<
import { RepositoryIndicatorUpdater } from './helpers/repository-indicator-updater'
=======
import { getAttributableEmailsFor } from '../email'
>>>>>>>
import { RepositoryIndicatorUpdater } from './helpers/repository-indicator-updater'
import { getAttributableEmailsFor } from '../email'
<<<<<<<
/**
* Wait ... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.