@Gauthier 200?

If you have tourtoisesvn installed with tortoisemerge you can use the command "git mergetool" then set your editor to tortoisemerge.

So far it's been the best conflict resolution tool that I have seen. The nice part is it has its own auto conflict resolution script and often is able to properly fix "conflicts" that didn't technically need to be conflicts due to whitespace differences etc...

@adbo I had no Idea, I just want a duck, and one dedicated to devrant would be even better.

I'm allergic.

Chrome extensions for measuring:
Aline
Dimensions

It's a bomb! o.o

If you run git gc --aggressive, it has a habit of doing this.

@FelisPhasma I guess the only thing you can do is hope for a stress ball...

It sounds like some serious unit testing is in order. .-.

I assume you have already bought a stressball in preparation.

Arch

@codeclod I know ; )

You milked that 404 so hard. :p

The ux for osx is really nice, combine that with *nix, and it's an amazing experience. The only time it's a worth touching windows is if you need .net, and even then there are technically "solutions."

@sande To be fair though, a spider that indexes anything that is considered the "deep web" and nothing else, could make a really amusing search engine.

I have to agree with ^
A robot would be close to the only thing that could tell a browser that it isn't a robot a "million times a day."
^.^

of Irish punk

I think a big difference is definitely the idea of "future proofing" and "team" coding. It took me far too long to fully understand what future proofing and "good" documentation / commit messages means.

As a female developer I can say the biggest reason I avoided people who were computer savvy was the inability to just be real with others. So many young devs seem to suffer very badly from social issues which is really unfortunate as a lot of them are really smart, amazing people.

I recently came out as bi (boo, sexuality) and am currently in a relationship with a girl who works in infosec. Having a lot of common interests with someone I am super close to is awesome. I ended up meeting her on a discord server about programming.

I'd say practice being more sociable if you struggle with it (as I do), and once you do find someone, be yourself and try not to be too anxious or needy about the future. Put in the effort that a relationship takes, but don't let your relationship define your life.

wouldn't it be like reddit, fml, and twitter had a baby... that proceeded to shut all 3 of it's parents out because ranting online is more exciting than spending time with family?

this is me... literally right now

pushed so far out of the page it appears in the page after.

At least it was only 30 minutes. 😧

nice ^.^