Hi, Coming late to the discussion, here are my 2 cent:
Am 06.08.25 um 16:04 schrieb Ricardo Wurmus:
I feel the same. It was an even bigger problem in the past with core-updates merges where it would be very hard to figure out a "stable" commit for time travel amidst all those commits that lie just somewhere between merges.
As Rutherther already mentioned, using --no-ff allows to create a merge-commit even after rebase.
When I was maintaining PyInstaller, I used this regularly to "collect"changes belonging to each other together - much like Ricardo suggests,and much like a rebased merge-request.
-- +++hartmut | Hartmut Goebel | | | [email protected] | www.goebel-consult.de |
