1097

My Git Knowledge (lemm.ee)

submitted 8 months ago by sag@lemm.ee to c/programmer_humor@programming.dev

178 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[-] Valmond@lemmy.mindoki.com 9 points 8 months ago

Why does

git rebase

work sometimes?

Yeah git can get quite complicated when there ate lots of people working on the same things.

[-] mkwt@lemmy.world 17 points 8 months ago

It's not git that's complicated. The work is complicated. git is just one of the tools that programmers use to manage the complexity.

I also think that some people get too hung up on having a "clean" history, and trying to "fix" the history after it has already occurred. I usually have enough problems to worry about in the present, without also trying to worry about the past.

[-] Wrench@lemmy.world 7 points 8 months ago

I find the "clean history" argument so flawed.

Sure, if you're they type to micro commit, you can squash your branch and clean it up before merging. We don't need a dozen "fixed tests" commits for context.

But in practice, I have seen multiple teams with the policy of squash merging every branch with 0 exceptions. Even going so far as squash merging development branches to master, which then lumps 20 different changes into a single commit. Sure, you can always be a git archeologist, check out specific revisions, see the original commits, and dig down the history over and over, to get the original context of the specific change you're looking into. But that's way fucking more overhead than just looking at an unmanipulated history and seeing the parallel work going on, and get a clue on context at a glance at the network graph.