Rakonda

[ 
  {name: 'Afghanistan', code: 'AF'}, 
  {name: 'Åland Islands', code: 'AX'}, 
  {name: 'Albania', code: 'AL'}, 
  {name: 'Algeria', code: 'DZ'}, 
  {name: 'American Samoa', code: 'AS'}, 
  {name: 'AndorrA', code: 'AD'}, 
  {name: 'Angola', code: 'AO'}, 
  {name: 'Anguilla', code: 'AI'}, 
  {name: 'Antarctica', code: 'AQ'}, 

Rakonda

/* 
I've compiled a list of angular directives according to their priorities (from most priority to lesser priority).
Also, terminal property is included for each directive that asserts it
*/

ng-switch	1200
ng-repeat	1000	terminal
ng-if		 600	terminal
ng-controller	 500
ng-init		 450

Rakonda

var gulp = require('gulp');
var gutil = require('gulp-util');
var bower = require('bower');
var concat = require('gulp-concat');
// var livereload = require('gulp-livereload');
var refresh = require('gulp-refresh');
var connect = require('gulp-connect');
var path = require('path');
var less = require('gulp-less');
var exec = require('gulp-exec');

Rakonda

import { Component, OnInit, OnDestroy } from '@angular/core';
import {Http} from "@angular/http";
import { LocalCacheService } from "./local-cache.service";

@Component({
  selector: 'app-example',
  templateUrl: './app.component.html',
  styleUrls: ['./app.component.scss']
})
export class ExampleComponent implements OnInit, OnDestroy {

Rakonda

Go to your master branch and do a "git pull"
Switch back to your branch you are merging and do "git rebase origin/master -i"
Solve any conflicts that arise and fix any commits as needed in VIM and exist ":wq"
After the rebase is completed do a "git push origin [your branch name] --force"