this post was submitted on 17 Feb 2025
430 points (98.2% liked)

Greentext

5205 readers
843 users here now

This is a place to share greentexts and witness the confounding life of Anon. If you're new to the Greentext community, think of it as a sort of zoo with Anon as the main attraction.

Be warned:

If you find yourself getting angry (or god forbid, agreeing) with something Anon has said, you might be doing it wrong.

founded 1 year ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] fossphi@lemm.ee 10 points 4 days ago (1 children)

Looks like she rebased and changed the history

[–] match@pawb.social 7 points 4 days ago (1 children)

nah, a rebase would mean he got to the end of summer and started another summer back up again

[–] Tyfud@lemmy.world 2 points 4 days ago

Rebase would mean only one of those two things is real and true in the history, and it's whatever the last thing was. The other one has no SHA or commits in history anywhere anymore and is essentially erased whenever the gitlog does a gc.

Merging is correct I believe (at least in this context), as you alluded to. But a rebase means only one version of summer exists, not another summer. And there's no record of that first summer ever existing after a -f push.