ggascoigne

#!/bin/bash
#
# Purpose: manually associate missed renames in merge conflicts
#
# Usage: git merge-associate <our-target> <base> <theirs>
#
# Example: After a failed rename detection A/a -> B/b which results
# in CONFLICT (delete/modify) for A/a and corresponding "deleted by us"
# messages in git status, the following invocation can be used to manually
# establish the link:

ggascoigne

The most important setting to enable computer usage is to change "Sharpness" to 0.

Otherwise, the rest is likely a matter of personal preference.

Picture
  Mode: User
  Contrast: 45
  Brightness: 55
  Color: 39

ggascoigne

2017-03-06 11:04:37.939 ERROR --- [           main] o.s.boot.SpringApplication               : Application startup failed

java.lang.NullPointerException: null
        at org.hibernate.engine.internal.StatefulPersistenceContext.addEntity(StatefulPersistenceContext.java:468)
        at org.hibernate.action.internal.AbstractEntityInsertAction.makeEntityManaged(AbstractEntityInsertAction.java:126)
        at org.hibernate.engine.spi.ActionQueue.addResolvedEntityInsertAction(ActionQueue.java:279)
        at org.hibernate.engine.spi.ActionQueue.addInsertAction(ActionQueue.java:254)
        at org.hibernate.engine.spi.ActionQueue.addAction(ActionQueue.java:299)
        at org.hibernate.event.internal.AbstractSaveEventListener.addInsertAction(AbstractSaveEventListener.java:318)
        at org.hibernate.event.internal.AbstractSaveEventListener.performSaveOrReplicate(AbstractSaveEventListener.java:275)

ggascoigne

// TypeScript Version: 3.5
// reflects [email protected]

// note that if you are using this you might well want to investigate the use of
// patch-package to delete the index.d.ts file in the react-table package

declare module 'react-table' {
  import {
    ComponentType,
    DependencyList,

ggascoigne

// Run a vulnerability audit with some retry logic for if the audit
// service is temporarily down (which we have seen sometimes in jenkins builds)
/* eslint-disable @typescript-eslint/no-var-requires */
require('perish')
const execa = require('execa')
const path = require('path')
const fs = require('fs')

const promiseRetry = require('promise-retry')
const PROJECT_ROOT_DIRNAME = path.resolve(__dirname, '..')

ggascoigne

/* eslint-disable @typescript-eslint/no-var-requires */
const { hasProp, getProp, getPropValue, elementType } = require('jsx-ast-utils')
/**
 * @typedef { import("@types/eslint").RuleContext }
 * @typedef { import("@types/eslint").RuleListener }
 * @typedef { import("@types/eslint").ASTNode }
 */

// eslint rule to ensure that Material UI TextField components have an id for associated labels.

ggascoigne

import 'graphiql/graphiql.css'

import { Trans, t } from '@lingui/macro'
import {
  InputLabel,
  MenuItem,
  Select,
  createStyles,
  makeStyles,
} from '@material-ui/core'