More like "while Dev write code change convention"

You have class names starting with lower and uppercase. As well as method names in lowercase, camel case and Pascal case.

Did the original contract stipulate anything about email?

If you're comfortable doing so you could paste the relevant clause/text from the contract here and people could give opinions on wether or not it could be interpreted to include the new request.

It's normally not an either-or situation. Only the scummiest of companies will try to pay in equity only.

Normally it's a lower salary in return for equity. For example the rate for a developer at Big Corp in your area is $50k but a new startup can only afford to pay $30k they might offer up equity or share options instead.

Say they did share options and the current valuation is $2/share and they give you 1,000. Well right now the shares are actually worth diddly-squat. A share option is only the OPTION to buy shares at a later date, but at today's valuation.

So in 3 years the company is bought, and the new valuation is $100 a share, you've made $98,000 ((1000 shares * $100/share) - $2k to buy at original price).

So your $30k/year + $98k means you've made $188k compared to the $150k you would have made at Big Corp.

But that only works out if the company succeeds. If they fail or you leave for any reason, you don't get your payout.

Bigger risk == bigger (potential) reward

Hey no problem. We all say the wrong thing sometimes, even for the right reason. What separates the good and bad people is wether or not you learn from it and avoid doing the same thing in the future.

Naturally sweet behaviour. Do you honestly not see the problem with your language here?

You know that you're not being a good ally yeah? Woman want equality in the work place, to be respected because they're damn good at their job not wonder if they're there because of their smile or because you think they're sweet.

When you talk about male colleagues do you focus on their appearance (smile) or how you think they're sweet? Then you shouldn't focus on that when talking about your female colleagues either.

Read back what you wrote. Now imagine you wrote it about a guy. Would you ever talk about how you like working with guys because of their smile?? Seriously WTF?

Don't use merge.

Imagine you have 3 branches (a, b & c) all being worked on concurrently. When it comes time to deploy the 3 branches get merged together and your history ends up looking like:

aacbabbcacbac

But oh no! A bug has been found and you need to roll back the "c" branch changes. Because the history is entwined you need to roll back to after commit 2, erasing all the "b" branch changes and most of those from "a".

But if you rebase then your history looks like

aaaaabbbbcccc

So rolling back your "c" branch becomes much easier as your history is not all jumbled.

Ideally you'd squash and then rebase so your history looks like

abc

I use OS X as it's just a prettier *nix, plus I love the build quality on their laptops. I couldn't go back now

Even for web development I find access to a real Terminal is a top priority. I can quite happily work on either Linux or OS X as I spend a good chunk of time on the command line, but I can't work on Windows.

Plus most tooling is geared around *nix environments, sometimes with Windows as an afterthought. Even getting Python and virtualenv working on Windows is a PITA.

I've had this before. Many cellular providers in the UK proxy all mobile traffic. This proxy performs several "optimisations" to the requested page including sometimes inlining or compressing Javascript. I've had these "optimisations" break a page on more than one occasion.

That's why I love working in Python. Your code would fail pep8 and break the build, so it wouldn't get merged ;)

Another "Senior" here, and I disagree, you do still have free time. Work tends to expand to fill the available space. A lot of companies are finding now that they're just as productive working a 4 day week as a 5.

So I spend my spare time working on my own lifestyle startup, I also spend time keeping up-to-date with latest technology trends, and I build the odd little side project when I want to try out a new language or technology.

I also love to travel, so I attend as many conferences as I can. Normally I'll stay on a few days after the conference so my wife can fly out and we can do the tourist thing for a bit as well.