odnodn

Git-workflow vs feature branching

When working with Git, there are two prevailing workflows are Git workflow and feature branches. IMHO, being more of a subscriber to continuous integration, I feel that the feature branch workflow is better suited, and the focus of this article.

If you are new to Git and Git-workflows, I suggest reading the atlassian.com Git Workflow article in addition to this as there is more detail there than presented here.

I admit, using Bash in the command line with the standard configuration leaves a bit to be desired when it comes to awareness of state. A tool that I suggest using follows these instructions on setting up GIT Bash autocompletion. This tool will assist you to better visualize the state of a branc

Branching

Quick Legend

Description, Instructions, Notes

Instance	Branch

We subscribe to the Git Featrue Branch workflow, briefly described in that link.

In practice, it works as follows:

FEATURE DEVELOPMENT

Steps to Follow:

Start with an updated local development branch -- by checking out the dev branch and pulling changes:
git checkout development
git pull origin development

	// IMPORT ALL MATERIAL COMPONENTS
	// #STEPS
	// 1- Import this file as module in app.module.ts ==> import { MaterialModule } from './xyz/abc';
	// 2- Initialize it in imports:[] array ==> imports:[MaterialModule]

	import { NgModule } from '@angular/core';
	// ************* FORM CONTROLS *************
	import {MatAutocompleteModule} from '@angular/material/autocomplete';
	import {MatCheckboxModule} from '@angular/material/checkbox';
	import {MatDatepickerModule} from '@angular/material/datepicker';

 //https://github.com/node-modules/emoji
 //http://apps.timwhitlock.info/emoji/tables/unicode
 var unified_emoji_ranges = [
   '\ud83c[\udf00-\udfff]', // U+1F300 to U+1F3FF
   '\ud83d[\udc00-\ude4f]', // U+1F400 to U+1F64F
   '\ud83d[\ude80-\udeff]'  // U+1F680 to U+1F6FF
 ];

	aber
	abermals
	abgerufen
	abgerufene
	abgerufener
	abgerufenes
	ähnlich
	alle
	allein
	allem

	// Variables used by Scriptable.
	// These must be at the very top of the file. Do not edit.
	// icon-color: deep-gray; icon-glyph: magic;
	// Licence: Robert Koch-Institut (RKI), dl-de/by-2-0
	//

	// -------------
	// Configuration
	// -------------

	// Variables used by Scriptable.
	// These must be at the very top of the file. Do not edit.
	// icon-color: deep-gray; icon-glyph: magic;
	// Licence: GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007
	// Author: Marcus Raitner (https://fuehrung-erfahren.de)
	// Source: https://github.com/marcusraitner/COVID-19-Dashboard
	// ## Changelog
	// * 1.0.1: Correction of layout of label for covid-beds
	// * 1.0.2: Bug-Fix for Saar-Pfalz-Kreis (using GEN instead of county for join)
	// * 1.0.3: Bug-Fix for Landsberg a. Lech (now using both GEN and county)

	<nav class="navbar navbar-fixed-top navbar-dark bg-inverse">
	<div class="container">
	<a class="navbar-brand">Angular Router</a>
	<ul class="nav navbar-nav" routerLinkActive="active">
	<li class="nav-item"><a class="nav-link" routerLink="home">Home</a></li>
	<li class="nav-item"><a class="nav-link" routerLink="about">About</a></li>
	<li class="nav-item"><a class="nav-link" routerLink="courses">Courses</a></li>
	</ul>
	</div>
	</nav>

	import Papa, { ParseConfig, Parser } from 'papaparse';

	export type CsvAsyncIteratorOptions = Exclude<
	ParseConfig,
	'step' \| 'chunk' \| 'complete' \| 'error'
	>;

	/**
	* Helper to allow async iteration over the contents of
	* a CSV input.