ummahusla

# overwrite master with contents of feature branch (feature > master)
git checkout feature      # source name
git merge -s ours master  # target name
git checkout master       # target name
git merge feature         # source name

ummahusla

Modes

Vim has two modes insertion mode and command mode. The editor begins in command mode, where the cursor movement and text deletion and pasting occur. Insertion mode begins upon entering an insertion or change command. [ESC] returns the editor to command mode (where you can quit, for example by typing :q!). Most commands execute as soon as you type them except for "colon" commands which execute when you press the ruturn key.

Quitting

• :x Exit, saving changes
  
• :q Exit as long as there have been no changes
  
• ZZ Exit and save changes if any have been made
  
• :q! Exit and ignore any changes
  

Inserting Text

ummahusla

const arr = [1, 2, 3, 4, 1, 2, 3]; 

const originalMap = arr.map(i => i + 1);

const myMap = (arr, cb) => {
  let temp = []; 
  
  for(let i = 0; i < arr.length; i++) {
      temp.push(cb(arr[i]));
  }

ummahusla

<?php
	class Site extends CI_Controller {

		function index() {
			$this->load->view('options_view');
		}

		function create() {
			$data = array(
				'title' 	=> $this->input->post('title'),

ummahusla

<select className="form-control ignore" id="currency" name="currency">
        <option value="36">AED - United Arab Emirates Dirham</option>
        <option value="175">AFN - Afghan Afghani</option>
        <option value="38">ALL - Albanian Lek</option>
        <option value="39">AMD - Armenian Dram</option>
        <option value="176">ANG - Netherlands Antillean Guilder</option>
        <option value="177">AOA - Angolan Kwanza</option>
        <option value="42">ARS - Argentine Peso</option>
        <option value="19">AUD - Australian dollar</option>
        <option value="178">AWG - Aruban Florin</option>

ummahusla

<div class="container">

	<div class="logo row">
		<div class="twelve column">
			<button id="myBtn">Open Modal test</button>
		</div>
	</div>

	<div id="grid">

ummahusla

## EXPIRES CACHING ##
<IfModule mod_expires.c>
ExpiresActive On
ExpiresByType image/jpg "access 1 year"
ExpiresByType image/jpeg "access 1 year"
ExpiresByType image/gif "access 1 year"
ExpiresByType image/png "access 1 year"
ExpiresByType text/css "access 1 month"
ExpiresByType application/pdf "access 1 month"
ExpiresByType text/x-javascript "access 1 month"

ummahusla

.rotate {

/* Safari */
-webkit-transform: rotate(-90deg);

/* Firefox */
-moz-transform: rotate(-90deg);

/* IE */
-ms-transform: rotate(-90deg);

ummahusla

Regular text shadow:
p { text-shadow: 1px 1px 1px #000; }

Multiple shadows:
p { text-shadow: 1px 1px 1px #000, 3px 3px 5px blue; }

ummahusla

Sans-Serif
Arial, sans-serif;
Helvetica, sans-serif;
Gill Sans, sans-serif;
Lucida, sans-serif;
Helvetica Narrow, sans-serif;
sans-serif;

Serif
Times, serif;