Rob Pataki robpataki

How to / Git

Branching strategy

We use a form of Git flow to maintain a stable master branch, and work off feature branches to introduce new features and other code updates. The feature branches are tied to JIRA tickets.

To keep our git log clean and tidy we use git's rebase strategy. That means that instead of merging commits in and out of the master branch (resulting in many ugly merge commits) we always keep our own feature branch's commits on top of the existing master branch commits.

You can read more about the rebase strategy here: https://www.atlassian.com/git/tutorials/merging-vs-rebasing.

Git notes

Change author of the last commit

git commit --amend --author="Rob Pataki <[email protected]>"

Prune remote branches on local

git remote prune origin

	/*
	Example usage:
	<span class="moment" data-moment="add 12 days"></span>
	*/

	'use strict'

	import moment from 'moment'

	/* TimeTravel */

	var CALENDAR_ID = 'XXX';
	var CRUNCH_TEMPLATE_ID = 'XXX';
	var CRUNCH_FOLDER_ID = 'XXX';
	var NA = 'N/A';
	var INVALID_DATE = 'Invalid Date';
	var CALENDAR = CalendarApp.getCalendarById(CALENDAR_ID);

	/* Populate custom menu */
	function onOpen() {
	var spreadsheet = SpreadsheetApp.getActive();

	<!-- Define a hashmap -->
	<ol class="app-task-list">
	<th:block th:with="tasks=${ {{enabled: false, url: '', taskState: 'COMPLETED', titleCode: 'taskList.pre.section.checkEligibility'}} }">

	<th:block th:replace="~{ fragments/task-list :: task-list-group(${tasks}, #{taskList.pre.section.title}, 1)}" />
	</th:block>

	<th:block th:replace="~{ fragments/task-list :: task-list-group(${tasks}, #{taskList.application.section.title}, 2)}" />

	<th:block th:replace="~{ fragments/task-list :: task-list-group(${tasks}, #{taskList.apply.section.title}, 3)}" />

	// stylelint-disable declaration-no-important

	@use "sass:string";

	// Settings
	@use "scss-core/settings/vars";

	// Use the built-in generator below to generate simple utility class and placeholder pairs
	//
	// An example utility:

	{
	"eslint.run": "onSave",
	"eslint.format.enable": true,
	"eslint.validate": [
	"javascript",
	"javascriptreact",
	"typescript",
	"typescriptreact"
	],

	{# Conditionally render inline CSS class #}
	<div class="govuk-grid-row {{ 'govuk-!-margin-top-9' if not(showBackButton) else 'govuk-!-margin-top-3' }}">

	$columns: (
	xs: 2,
	s: 2,
	m: 8,
	l: 12,
	xl: 12,
	);
	$gutters: (
	xs:20px,
	s: 20px,

	let instance: Pointer;

	/**
	* Tracks the pointer in WebGL
	*/
	export default class Pointer {
	/**
	* Current coordinates
	* @return {x: number, y: number} The current pointer coordinates.
	*/