- Control total sobre que se mergea.
- El dueño del repo es el único responsable del código.
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.
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:
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
using System; | |
using System.Collections; | |
using System.Collections.Generic; | |
namespace Utilities | |
{ | |
public static class Maybe | |
{ | |
public static Maybe<T> From<T>(T value) => new Maybe<T>(value); | |
public static Maybe<T> None<T>() => default(Maybe<T>); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(function () { | |
'use strict'; | |
angular | |
.module('dopplerRelay') | |
.controller('TemplateCtrl', TemplateCtrl); | |
TemplateCtrl.$inject = [ | |
'$scope', | |
'templates', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(function () { | |
'use strict'; | |
angular | |
.module('dopplerRelay') | |
.directive('validationErrors', validationErrors); | |
validationErrors.$inject = [ | |
"$compile" | |
]; |
- Download and install p4Merge (Helix P4Merge: Visual Merge Tool) from Perforce page
- 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
- Mergetool:
- Difftool command:
"C:/Program Files/Perforce/p4merge.exe" "$LOCAL" "$REMOTE"
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
using System; | |
using System.Diagnostics; | |
using System.Linq; | |
using System.Net.Http; | |
using System.Threading.Tasks; | |
namespace Client | |
{ | |
class Program | |
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
using System; | |
using System.Text; | |
using System.Linq; | |
public static class EmailUrlObfuscation | |
{ | |
private static string AtSymbolEncode(this string email) => email | |
.Replace("]", "-]") | |
.Replace("@", "[a]"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/* | |
EXAMPLE EXECUTION | |
testname: GetNeverPonyNumber | |
uniques: 50000000 | |
collisions: 0 | |
examples: 8702a199572565e1, 84a4a866d8222e3f, 7de9de6bc852e14d | |
elapsed: 00:03:47.0953452 | |