News for hackers. Stuff that matters.
Re:Ask HN: What's the worst piece of software you use everyday? by PaulDavisThe1st on Saturday July 11, 2020 @07:35PM (#23807173)
>Should I rebase or merge? Or squash commits? Should I cherry pick onto a new branch?

From my perspective, these are policy decisions that need to be made by some "management-ish" level. Git provides the mechanism to do all of them. It's up to you/your organization to decide how to work.

In the open source project that I run (20 years, 75+ developers over time, 400-500k LOC) we all have a clear understanding of (e.g.) whether to merge or rebase. On the odd occasions that there's a lack of clarity, it's normally a great sign that it doesn't matter.

The fact the you would be asking those questions suggests to me that the necessary policy-level decisions have not been made (or have not been made clear).

Re:Ask HN: What's the worst piece of software you use everyday? by tsimionescu on Saturday July 11, 2020 @07:50PM (#23807262)
I'm not saying this is a decision every dev has to make. I am complaining about having to make these decisions as a team or team lead. Having choices is only nice if there are important use cases where each choice is useful, and if the difference is big enough. Otherwise, the choices are just adding complexity and buyer's remorse.

For most unitary organizations, some of the options that git gives you make no sense at all. That doesn't mean git should change, it means that it's not a great tool for unitary organizations.

Note that some of the choices (e.g. stash vs commit) are choices that each dev has to make individually, and some are pure incidental complexity.

Re:Ask HN: What's the worst piece of software you use everyday? by allarm on Saturday July 11, 2020 @09:42PM (#23807946)
So git gives you too much freedom, that’s what your complain is about? I find it hilarious.
Re:Ask HN: What's the worst piece of software you use everyday? by tsimionescu on Sunday July 12, 2020 @02:10AM (#23809262)
This is not 'freedom' it is excessive complexity.

`ls` wouldn't be better if I had to pass a flag to see the output as today, and another flag to print one character per line, and another flag to print each character in a different color etc. (even though that would give me 'more freedom').

Re:Ask HN: What's the worst piece of software you use everyday? by allarm on Sunday July 12, 2020 @12:27PM (#23812498)
I don’t think that git forces you to use all these bells and whistles. Also I am not sure if ls would be better with additional flags, but it won’t be worse because of that, that’s for sure.
Re:Ask HN: What's the worst piece of software you use everyday? by chipotle_coyote on Saturday July 11, 2020 @11:37PM (#23808592)
There is a difference between "too much freedom" and "not enough direction."
Re:Ask HN: What's the worst piece of software you use everyday? by allarm on Sunday July 12, 2020 @12:22PM (#23812453)
Sure there is - the difference is so huge that I don’t see any similarities. Though professional software should not direct you, thus limiting you in choices. Your expertise should do that. And if your expertise is not enough to make an educated choice it’s not a problem of the software.
Re:Ask HN: What's the worst piece of software you use everyday? by bmitc on Saturday July 11, 2020 @08:54PM (#23807663)
Those are hard decisions to make in organically developed organizations like companies.

Part of the problem is that Git, to make it manageable, requires all of these types of concerns and decisions to be addressed, and secondly, it has somehow become the only standard that people have even heard of. There isn't even a decision about which system to use anymore.

Having used both, I still prefer Perforce over Git. And if it were up to me, I would take a step back and investigate other offerings like Plastic SCM. But trying to make these decisions is nearly impossible now that Git is treated as a given.

Re:Ask HN: What's the worst piece of software you use everyday? by mikeyjk on Saturday July 11, 2020 @09:57PM (#23808029)
I seriously disagree. Branching models are one of the few things that can be decided upon at short notice. It shouldn't be changed every day, but going from merge commits to rebasing is not going to prevent anyone from working. The VCS history will just look confusing temporarily.