merge conflicts during merges from main branches into feature branches: absurd, incomprehensible, might as well be shooting tachyons into the reflog

jess. @staff, kind of. CRIT Award-nominated TTRPG designer. jewish lesbian. marxist. scifi author. educator. musician. agitprop writer. she/her โญ ืงืขืจ ืึท ืืืขืื ืืืื ื
freelancing: available!
merge conflicts during merges from main branches into feature branches: absurd, incomprehensible, might as well be shooting tachyons into the reflog
the reflog (accessed with git reflog) is pretty much the closest thing to a complete, unified history that git maintains. it tracks every time you checkout, commit, or stash and provides a hash for accessing that point in the history!