Hacker News new | ask | show | jobs
by IgorPartola 81 days ago
Ah that’s fair. This is why I would do a `git merge main` instead of a rebase here.
1 comments
ljm 81 days ago
I have met more than one person who would doggedly tolerate rebase, not even using rerere, instead of doing a simple ‘git merge --no-ff’ to one-shot it, not understanding that rebase touches every commit in the diff between main and not simply the latest change on HEAD.

Not a problem if you are a purist on linear history.

link
em-bee 80 days ago
not understanding that rebase touches every commit in the diff

it sounds like that's a problem for you. why would that be? i prefer rebase and fast forward, but i am fully aware that rebase rewrites all commits.

link