andresmoschini

1. Download and install p4Merge (Helix P4Merge: Visual Merge Tool) from Perforce page
2. Configure Git Extensions (Tools / Settings / Git Config) with the follow values (see image):
   • Mergetool: p4merge
   • Path to mergetool: C:/Program Files/Perforce/p4merge.exe
   • Mergetool command: "C:/Program Files/Perforce/p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
   • Difftool: p4merge
   • Path to difftool: C:/Program Files/Perforce/p4merge.exe

• Difftool command: "C:/Program Files/Perforce/p4merge.exe" "$LOCAL" "$REMOTE"

andresmoschini

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

// https://softwareengineering.stackexchange.com/questions/300242/will-the-database-connection-be-closed-if-we-yield-the-datareader-row-and-not-re

Console.WriteLine("Prueba foreach");
foreach (var i in GetItems("Prueba foreach"))
{

andresmoschini

Aplicando Git Bisect

Desde hace tiempo, cuando recién estaba investigando qué era Git, me llamo la atención el comando git bisect, pero siempre imaginé que sería dificil de aplicar y nunca se me ocurrió probarlo, hasta ahora.

El escenario

Trabajé en un feature branch, hice el Pull Request y recién luego (mal por mi) ejecuté los tests, que lamentablemente fallaron.

Los tests los corro con el siguiente comando:

andresmoschini

# alias radio='function __radio(){ r=`grep -v "#" radios_nacionales.txt | grep -m 1 -i $1 | cut -d" " -f1`; cvlc $r 2> /dev/null; }; __radio'
# podria utilizarse mplayer en vez de vlc

AMs Nacionales

http://66.70.255.8:9436/baires?type=.mp3                                              Radio Madre         530
http://www.servidorstreaming1.com:9962/;                                    Radio Colonia       550
http://195.154.182.222:25223/live.mp3                                       Radio Argentina     570
http://playerservices.streamtheworld.com/api/livestream-redirect/CONTINENTAL_SC                        Continental         590
http://209.95.35.49:7012/stream                                             Rivadavia           630

andresmoschini

body {
    background: #000;
}

andresmoschini

Before merge

*      A2
|  
|  *   B2
|  |  
|  *   B1
|  |

andresmoschini

/*
EXAMPLE EXECUTION

testname: GetNeverPonyNumber
uniques: 50000000
collisions: 0
examples: 8702a199572565e1, 84a4a866d8222e3f, 7de9de6bc852e14d
elapsed: 00:03:47.0953452

andresmoschini

using System;
using System.Text;
using System.Linq;

public static class EmailUrlObfuscation
{
    private static string AtSymbolEncode(this string email) => email
        .Replace("]", "-]")
        .Replace("@", "[a]");

andresmoschini

using System;
using System.Diagnostics;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;

namespace Client
{
    class Program
    {

andresmoschini

(function () {
  'use strict';

  angular
    .module('dopplerRelay')
    .directive('validationErrors', validationErrors);

  validationErrors.$inject = [
    "$compile"
  ];