News for hackers. Stuff that matters.
Re:Julia Evans: Git rebase, what can go wrong by unlikelytomato on Monday November 06, 2023 @10:00PM (#38172660)
I read this justification in nearly every thread that pops up git rebase. I feel like a full because I cannot think of a real world example when this information crosses from signal to noise. Generally, branches that are not ready to merge tend to have enormous amounts of noise commits. Is there a blog post or some concrete examples I could work through that illustrate these benefits? I feel like workflows dramatically different from mine are likely the source of my struggle.
Re:Julia Evans: Git rebase, what can go wrong by fulafel on Tuesday November 07, 2023 @12:29AM (#38173612)
It's a log of what happened in dev and supports reconstructing history to understand why something worked or didn't in retrospect. "It work when we tried it" "oh this dependency was updated in this merge commit that could have changed the behaviour"
Re:Julia Evans: Git rebase, what can go wrong by unlikelytomato on Tuesday November 07, 2023 @07:31AM (#38176047)
I am not sure how this is unique to a merge commit. The commit with the dependency change still exists in the main branch. The commit should never have gotten into main branch of it failed tests. If I take a positive action to rebase, I am accepting my fate from master anyway. If I merge into my working branch instead of rebase, that historical context issue only useful for that moment in time of reconstructing history and is not useful anymore. Once a branch goes into master, I want commits to main to have a 1:1 ratio of committed code for a task to positive action taken by a human.
Re:Julia Evans: Git rebase, what can go wrong by fulafel on Wednesday November 08, 2023 @01:52AM (#38187486)
It's not unique to a merge commit of course, but a point in favour of preserving history.