Skip to content

Instantly share code, notes, and snippets.

@funyx
funyx / Update-branch.md
Created October 11, 2018 08:39 — forked from santisbon/Update-branch.md
Bring your feature branch up to date with master. Deploying from Git branches adds flexibility. Bring your branch up to date with master and deploy it to make sure everything works. If everything looks good the branch can be merged. Otherwise, you can deploy your master branch to return production to its stable state.

Updating a feature branch

First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)

$ git checkout master

Fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master

@funyx
funyx / Branch.php
Last active October 18, 2018 13:03
<?php
namespace forest\Model;
class Branch extends \forest\Model
{
public $table = 'branch';
public $title_field = 'branch_name';
public $caption = 'Branch';
@funyx
funyx / .notes.md
Last active December 18, 2018 07:11
Implementation of ContainsOne (merging models)

#Notes

  • uses array spawn to access protected properties - their_field, our_field
  • reference::model type Closure not implemented
@funyx
funyx / composer.json
Created February 11, 2019 04:38 — forked from mfurlend/composer.json
composer require git repository
{
"name": "my_vendor_name/my_package",
"description": "My Package Description",
"license": "GPL-3.0",
"autoload": {
"classmap": [ // search these directories for classes
"lib/"
]
},
"repositories": {
@funyx
funyx / API.php
Created March 13, 2019 12:02
atk4/api
<?php
namespace app;
use \atk4\core\Exception;
use \atk4\core\InitializerTrait;
use \atk4\core\HookTrait;
use \atk4\core\DynamicMethodTrait;
use \atk4\core\ContainerTrait;
use \atk4\core\FactoryTrait;
@funyx
funyx / jsAjax.php
Created August 26, 2019 08:06
atk4\ui\jsAjax
<?php
namespace atk4\ui;
use atk4\ui\Exception;
class jsAjax implements \atk4\ui\jsExpressionable
{
public $setup = null;
Region Area Regex
London UB.* TRUE
North East DH.* TRUE
North West M.* TRUE
London NW.* TRUE
East CO.* TRUE
London N.* TRUE
London CR.* TRUE
London SW.* TRUE