HN user

Horba

17 karma
Posts0
Comments16
View on HN
No posts found.
Git is too hard 6 years ago

1. This isn't currently possible. It would require git to track the staging area for each commmit and branch.

2. See 1.

3. `git pull` by definition conducts a fetch because it Incorporates changes from a remote repository into the current branch.

4. Use `git config push.default current`.

5. Use `git branch --no-track new existing`.

6. I assume this is something to do with the reflog.

It'll be shy of apocalyptic. There'll be 3-5 years of chaos in loans, credit cards, insurance etc.

Mortgages and business loans will be less affected because real people actually go out and inspect those things. I think we'll have to get used to speaking face to face with real people again when we want any kind of long term financial product.

There will be _the_ data leak.

It's impossible to remotely validate who anyone is regardless of provided name, age, birth location, mothers maiden name, social security, previous address, contacts, fingerprints, retina scan, DNA profile ...

This will end the privacy debate because all personally identifiable data will be public knowledge. All private information (stored in the cloud) will be easily leaked due to _the_ data leak. Blackmail will be rampant.

It'll be common to have credit cards and loans taken out in your name. Companies will be inundated with bots and trolls creating accounts. Fintech and government will scramble to prop up the system of trust with government issued ID, which will then be leaked, collapsing the system completely.

The sheer amount of fraud causes a contraction in the availability of credit with impact on the scale of the credit crunch of 08.

I've implemented GitFlow with multiple support versions. We just added a "version" dimension to each of the main branches.

1.1/master 1.1/release 1.1/development

1.2/master 1.2/release 1.2/development

When we fix bugs in 1.x, we work off 1.1/development and merge into all later versions.

This doesn't fit for a "web" or "continuous delivery" model. It does fit very well for software houses with many customers on 6 monthly upgrade / development cycles.