Anzumana

Table Of Content

Skip to the relevant sections if needed.

• 2-min tutorial to do it the quick-and-dirty-way
• Concepts for resolving Git conflicts
• Setting up different editors / tool for using git mergetool
  • Finding out what mergetool editors are supported
• mergetool simple code example for vimdiff
  • Resolving conflict from a Git pull
• Other great references and tutorials

Anzumana

/*
 * LimeSurvey
 * Copyright (C) 2007 The LimeSurvey Project Team / Carsten Schmitz
 * All rights reserved.
 * License: GNU/GPL License v2 or later, see LICENSE.php
 * LimeSurvey is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
 * See COPYRIGHT.php for copyright notices and details.

Anzumana

    const conntededTrafficEvents = [
      {
        path: [
          [
            8.664869900000001,
            52.057082
          ],
          [
            8.6657917,
            52.05697970000001

Anzumana

{
  "name": "app-angular",
  "version": "0.0.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
    "@angular-devkit/architect": {
      "version": "0.13.8",
      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.8.tgz",
      "integrity": "sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==",

Anzumana

		var tmp = [];
		for(var i=0; i< data.length;i++){
			if(tmp.indexOf(data[i].category) == -1){
				tmp.push(data[i].category);
			}
		}
		console.log('this is my result');
		console.log(tmp);

Anzumana

#!/usr/bin/env perl

use 5.24.0;
use warnings;
use Term::ANSIColor;
chomp( my @branches
    = qx/git show -s --pretty='%cn|%ci %D' \$(git rev-parse --branches --remotes)/
);

my %branches_for;

Anzumana

 for(var i = 0 ; i < $scope.data.filteredLinesArray.length ; i++){
    if(!($scope.data.filteredLinesArray[i].currentChanges.length > 0)){
      $scope.data.filteredLinesArray.splice(i,1);
      //reset index else we miss elements of the array since we use splice to removed an element
      i = -1;
    }  
 }

Anzumana

<VirtualHost *:80>
</VirtualHost>

Anzumana

let g:incr = 1
let g:incr2 = 1

fu! Incr() 
  let g:incr = g:incr - 1
  return g:incr
endfu

fu! Incr2() 
  let g:incr2 = g:incr2 - 1

Anzumana

javascript:(function(){var p=document.createElement("p");p.innerHTML="<strong>Loading&hellip;</strong>";p.id="loadingp";p.style.padding="20px";p.style.background="#fff";p.style.left="20px";p.style.top=0;p.style.position="fixed";p.style.zIndex="9999999";p.style.opacity=".85";document.body.appendChild(p);document.body.appendChild(document.createElement("script")).src="https://gist.github.com/ttscoff/5834741/raw/grablinks.js?x="+(Math.random());})();