Beta

Slashdot: News for Nerds

×

Welcome to the Slashdot Beta site -- learn more here. Use the link in the footer or click here to return to the Classic version of Slashdot.

Thank you!

Before you choose to head back to the Classic look of the site, we'd appreciate it if you share your thoughts on the Beta; your feedback is what drives our ongoing development.

Beta is different and we value you taking the time to try it out. Please take a look at the changes we've made in Beta and  learn more about it. Thanks for reading, and for making the site better!

You Just Never Know

stoolpigeon (454276) writes | more than 2 years ago

User Journal 1

OK - I'm not going to talk about sports all the time, but this week-end I started watching the Everton/Manchester United match. I'm an Everton fan. When I had to time to check it out, the second half had just started and it was 1-1. I was pleasantly surprised. But within just a few minutes Man U scored twice and it was 3-1. I really didn't feel like watching Everton get crushed and I had other stuff I ought to be doing anyway, so I shut it off and went and did the other stuff. Last night I wa

OK - I'm not going to talk about sports all the time, but this week-end I started watching the Everton/Manchester United match. I'm an Everton fan. When I had to time to check it out, the second half had just started and it was 1-1. I was pleasantly surprised. But within just a few minutes Man U scored twice and it was 3-1. I really didn't feel like watching Everton get crushed and I had other stuff I ought to be doing anyway, so I shut it off and went and did the other stuff. Last night I was checking scores from throughout the day and that match ended in a 4-4 draw. Should have watched it, but you just never know. (And the super-bonus, didn't expect it awesome news was that Liverpool lost to West Brom and Everton actually gained a point on them. Woot!)
 
Now to pull this around to something less sport-y. I'm learning git and it's pretty cool. That is all.

cancel ×

1 comment

git is awesome for what we do (1)

Qzukk (229616) | more than 2 years ago | (#39769581)

git rebase has cut probably hundreds of hours of work in the time since we switched from CVS about a year ago. We do heavy customization of our codebase for our clients, so before we'd just hit cvs update and pray. When our prayers go unanswered, we'd sort through all the files marked C and try to remember what the heck we were doing.

Since git rebase applies each change one at a time until there's a problem, it can tell me exactly what the hell I was trying to do when I changed one line for one client. git cherry-pick allows me to take the best requested features and add them to the core codebase for everyone's benefit. Each client gets a product-version-client branch, whenever the core code changes we rebase all the client branches to the new base branch. We still have a "central" repository everything pulls from/pushes to, but only the core code goes there, the -client branches remain in their own local repositories.

Check for New Comments
Slashdot Account

Need an Account?

Forgot your password?

Don't worry, we never post anything without your permission.

Submission Text Formatting Tips

We support a small subset of HTML, namely these tags:

  • b
  • i
  • p
  • br
  • a
  • ol
  • ul
  • li
  • dl
  • dt
  • dd
  • em
  • strong
  • tt
  • blockquote
  • div
  • quote
  • ecode

"ecode" can be used for code snippets, for example:

<ecode>    while(1) { do_something(); } </ecode>
Create a Slashdot Account

Loading...