Xerosigma

Squashing Git Commits

The easy and flexible way

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).

Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.

Switch to the master branch and make sure you are up to date:

Xerosigma

<link rel="import" href="../core-icon-button/core-icon-button.html">
<link rel="import" href="../core-toolbar/core-toolbar.html">
<link rel="import" href="../paper-tabs/paper-tabs.html">
<link rel="import" href="../paper-tabs/paper-tab.html">
<link rel="import" href="../core-pages/core-pages.html">
<link rel="import" href="../core-input/core-input.html">
<link rel="import" href="../core-icons/core-icons.html">
<link rel="import" href="../core-icons/av-icons.html">
<link rel="import" href="../paper-fab/paper-fab.html">
<link rel="import" href="../paper-toast/paper-toast.html">

Xerosigma

<link rel="import" href="../core-pages/core-pages.html">
<link rel="import" href="../paper-input/paper-input.html">
<link rel="import" href="../paper-button/paper-button.html">

<polymer-element name="my-element">

  <template>
    <style>    
      :host {
        width: 100%;

Xerosigma

<?xml version="1.0" encoding="utf-8"?>

<resources>

  <color name="red_50">#fde0dc</color>
  <color name="red_100">#f9bdbb</color>
  <color name="red_200">#f69988</color>
  <color name="red_300">#f36c60</color>
  <color name="red_400">#e84e40</color>
  <color name="red_500">#e51c23</color>

Xerosigma

'use strict';

/**
 * @ngdoc overview
 * @name web-starter-kit
 * @description
 * # web-starter-kit
 *
 * Main module of the application.
 */

Xerosigma

<link rel="import" href="../topeka-elements/theme.html">
<link rel="import" href="../topeka-elements/topeka-resources.html">
<link rel="import" href="../topeka-elements/topeka-app.html">

<polymer-element name="my-element">

  <template>
    <style>    
      :host {
        position: absolute;

Xerosigma

(index):35 Consider using 'dppx' units, as in CSS 'dpi' means dots-per-CSS-inch, not dots-per-physical-inch, so does not correspond to the actual 'dpi' of a screen. In media query expression: only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi)
loader.js:87 XHR finished loading: GET "http://localhost:3000/bower_components/paper-shadow/paper-shadow.css".
loader.js:87 XHR finished loading: GET "http://localhost:3000/bower_components/paper-radio-button/paper-radio-button.css".
loader.js:87 XHR finished loading: GET "http://localhost:3000/bower_components/paper-checkbox/paper-checkbox.css".
loader.js:87 XHR finished loading: GET "http://localhost:3000/bower_components/paper-dialog/paper-dialog.css".
loader.js:87 XHR finished loading: GET "http://localhost:3000/bower_components/core-dropdown/core-dropdown.css".
loader.js:87 XHR finished loading: GET "http://localhost:3000/bower_components/core-menu/core-menu.css".
loader.js:87 XHR finished loading: GET "http://localhost:3

Xerosigma

// Search
Object {self: Object, search: Object}

// Employees array
Object {employees: Array[2]}

// Pages
Object {size: 20, totalElements: 2, totalPages: 1, number: 0}

// ?????

Xerosigma

<link rel="import" href="../core-scaffold/core-scaffold.html">
<link rel="import" href="../core-header-panel/core-header-panel.html">
<link rel="import" href="../core-menu/core-menu.html">
<link rel="import" href="../core-item/core-item.html">
<link rel="import" href="../core-icon-button/core-icon-button.html">
<link rel="import" href="../core-toolbar/core-toolbar.html">
<link rel="import" href="../core-input/core-input.html">
<link rel="import" href="../core-menu/core-submenu.html">
<link rel="import" href="../speech-mic/speech-mic.html">
<link rel="import" href="../google-map/google-map-search.html">

Xerosigma

package com.provider.spring.controller;

import java.io.IOException;
import java.util.List;
import java.util.concurrent.Future;

import org.springframework.hateoas.Link;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.AsyncResult;
import org.springframework.stereotype.Controller;