On 24/01/25 12:22, Johannes Schauer Marin Rodrigues wrote:
Quoting Gioele Barabucci (2025-01-24 09:49:27)
I disagree with this conclusion. Sometimes features are extensively
discussed in salsa merge requests or issues, and the entire discussion just
can't be summarized in a git commit message (and it is not desirable to
even attempt that).
True. This is why MR discussions should be automatically saved in git
notes attached to the merge commit. In this way the discussion will be
preserved and the Git repo will contain the whole development history,
freeing Debian from an eternal dependency on Salsa/GitLab.
Spending time writing the code that automates that is a much better
investment compared to copying stuff back and forth between BTS/Salsa/mailing
lists.
> But why a merge commit? I usually configure my salsa repos to *not*
create
merge commits but instead rebase the MR on top of the target branch without an
extra commit on top.
To use or not to use merge commits is a matter of taste and personal
preferences. My favorite combo is rebase + merge. In this way the
history is pretty much linear, but the merge commits clearly shows that
a bunch of commits belong together.
I'm likely in lack of understanding here but I have not yet understood the
utility of merge commits. You say that they could be useful to attach git notes
to it. But can these notes not also attached to regular commits?
You can attach notes to any Git object, including regular commits.
Regards,
--
Gioele Barabucci
