17 May '13, 8pm

Used content from @quandora to drive out a blog post: "git rebase vs. git merge: an agile perspective"

Tight feedback loops are one of the things that Pivotal values. We place priority on CI and small stories. This makes it easier to work on master – it’s not a big deal if it is accidentally broken, it’ll be easily fixed or reverted. In my experience, we still do use topic branches when appropriate. E.g., in the middle of a story at the end of a day, or for a bigger feature that you don’t want to do in one commit, but would break mainline (master) with the intermediate commit. On my project, in this case, we usually merge –squash –no-commit onto master, to squash multiple commits on the topic branch into one commit on master. Even in git, branching is still painful. The longer a topic branch lives, the harder it is to merge. Yes, you can rebase often, but that means you have to rewrite history to push the rebased changes to the server. This can cause confusion if the branch...

Full article: http://pivotallabs.com/git-rebase-vs-git-merge-an-agile-p...

Tweets

#GreenerBuilder speaker Jason McLennan's perspe...

usgbc-ncc.org 17 May '13, 7pm

I would further Kunstler’s assertion, predicting that the age of the skyscraper will also come to an end within the next c...

Why "Upstream Keepalive" is a Good Thing - Pivo...

pivotallabs.com 17 May '13, 9am

As Dan mentioned on Monday , Tracker uses an architecture in which a large number of polling requests are serviced by web ...

Finding Pivotal

pivotallabs.com 21 May '13, 4am

The year is 2005. I’m one year out of school, and a year into a job doing PHP web development at a small development firm ...

Oh, word? But I thought the YEEZY jumped over the JUMPMAN...

Oh, word? But I thought the YEEZY jumped over t...

theshoegame.com 22 May '13, 9pm

and those profits will just go up with these restocks. starving off the resellers will only increase the margins at nike, ...

My latest blab: Why Pivotal

pivotallabs.com 26 May '13, 9pm

It is a time-honored tradition for Pivots to blog about their first few months at Pivotal. A typical day at Pivotal is str...