lucasgonze / Safeharbor.in

2 stars 0 forks source link

need to tweak git recipes to prevent accidental overwrites #272

Closed lucasgonze closed 11 years ago

lucasgonze commented 11 years ago

Paige, it sometimes happens that in a checkin/push you'll overwrite previous commits with new commits that are identical. This is super confusing and creates work.

In this commit: https://github.com/lucasgonze/Safeharbor.in/commit/690c1b5feeaaec1a2b0f2aa1ebbeb32c87d5297a

The change to rest-routes.js is an example: https://github.com/lucasgonze/Safeharbor.in/blob/690c1b5feeaaec1a2b0f2aa1ebbeb32c87d5297a/routes/test-routes.js

It doesn't make sense that you're committing or pushing any changes you didn't personally make.

Probably the cause is in one of your standard recipes for git command lines. Let's do a hangout and look at those.

paigesaez commented 11 years ago

oh how interesting. gotcha. ok i'm around.

On Mon, Nov 19, 2012 at 11:31 AM, Lucas Gonze notifications@github.comwrote:

Paige, it sometimes happens that in a checkin/push you'll overwrite previous commits with new commits that are identical. This is super confusing and creates work.

In this commit: 690c1b5https://github.com/lucasgonze/Safeharbor.in/commit/690c1b5feeaaec1a2b0f2aa1ebbeb32c87d5297a

The change to rest-routes.js is an example:

https://github.com/lucasgonze/Safeharbor.in/blob/690c1b5feeaaec1a2b0f2aa1ebbeb32c87d5297a/routes/test-routes.js

It doesn't make sense that you're committing or pushing any changes you didn't personally make.

Probably the cause is in one of your standard recipes for git command lines. Let's do a hangout and look at those.

— Reply to this email directly or view it on GitHubhttps://github.com/lucasgonze/Safeharbor.in/issues/272.

Ph: 971-227-4384 m: paige@makerlab.com w: http://makerlab.com

\\/////MAKERLAB/////\\ User Experience Design / Interaction Design / HCI Research Jellyfish Gallery 1286 Folsom St. SF, CA 94103

lucasgonze commented 11 years ago

Let's take this out of the bug tracker, because it's more of a reminder/ conversation starter.