nickfloyd

-from master in working branch
>> git branch [new branch] [tag]
>> git checkout [branch]
-pull commit out and add it to the commit at the top of the tag
>> git cherry-pick [commit] or git cherry-pick [firstcommit]^..[lastcommit] if you have a range
-resolve conflicts
-delete the local tag
>> git git tag -d [tag]
-add a new tag at the head of the old one
>> git tag [tag]

nickfloyd

-delete the remote
>> git push [remote] :[branch]

-delete the local
>> git branch -d [branch]

ex.
git push origin :dev1
git branch -d dev1

nickfloyd

git push -f origin HEAD\^:master


so commit history in the remote looks like:

Had to clean up some things from the merge 
nickfloyd (author)
January 26, 2011
commit  4bcce9878c454ba5583c
tree    e6f4cffa47b1301a4cfc

brianlow

using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using NUnit.Framework;
 
namespace MyProject
{
    [TestFixture]

haacked

public static class TestHelpers
{
    public static void ShouldEqualWithDiff(this string actualValue, string expectedValue)
    {
        ShouldEqualWithDiff(actualValue, expectedValue, DiffStyle.Full, Console.Out);
    }

    public static void ShouldEqualWithDiff(this string actualValue, string expectedValue, DiffStyle diffStyle)
    {
        ShouldEqualWithDiff(actualValue, expectedValue, diffStyle, Console.Out);

trey

Creating a Happy Git Environment on OS X

Step 1: Install Git

brew install git bash-completion

Configure things:

git config --global user.name "Your Name"

git config --global user.email "you@example.com"

cheeaun

JavaScript error logging services

To allow easier contributions, I've moved this to https://github.com/cheeaun/javascript-error-logging. Thanks! 😄

• http://errorception.com/ - translate error messages to English
• http://www.exceptionhub.com/
• http://jserrlog.appspot.com/
• http://www.muscula.com/ - source maps, translate error messages to English
• https://www.airbrake.io/ - tracekit, source maps

anaisbetts

File => Attach To Process, pick devenv.exe

First, fix the symbols and shit

.symfix
.reload
.loadby sos clr

lfender6445

Pry Cheat Sheet

• Youtube Tutorial 2013

Command Line

• pry -r ./config/app_init_file.rb - load your app into a pry session (look at the file loaded by config.ru)
• pry -r ./config/environment.rb - load your rails into a pry session

Debugger

chadman

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace budget {
   public class Program {
        static void Main(string[] args) {
            var debt = new DebtCalculation(500);