On Sat, Aug 23, 2025 at 04:45:23PM +0200, Marc Haber wrote:
On Fri, Aug 22, 2025 at 01:34:16PM -0700, Otto Kekäläinen wrote:
If think giving feedback and letting the submitter finalize the thing
will help them feel more ownership, but if you do decide to just
quickly do it yourself, you can actually edit the Merge Requests on
Salsa (and Pull Requests on GitHub). The official documentation is at
https://salsa.debian.org/help/topics/git/forks.md#push-to-a-fork-as-an-upstream-member
but it is a bit hard to understand without an example. I will try to
write a post about this with Debian examples in my blog soon.
When I push to a fork of my project, this is about twice the work than
just doing a trivial change in my own project. And, again, I find it
more hostile to git push --force to an active branch on a foreign git
repo owned by a stranger than just taking the trivial patch and giving
proper credit in the commit message.
oh, yes, and doing this without --force assumes that the patch submitter
has considerable amount of git foo to even detect that they just had
their history rewritten. Pushing without --force assumes that the patch
submitter has enough git foo to sort out a git rebase --interactive to
squash my correction commits into their history while still having a
clean commit queue.
I find that this amount of git knowledge cannot be safely assumed.
Being far from being a git expert (see xkcd 1597) myself, I found myself
working with patch submitters who had a hard time branching, pulling and
rebasing their work on my moving dev branch, ended up being yelled at
again for breaking their work by just continuing my work and being
unable to explain git to them. In the end, those submitters sent entire
files by e-mail and expected me to do manual merges.
Not everybody is a git wizard.
Greetings
Marc
--
-----------------------------------------------------------------------------
Marc Haber | "I don't trust Computers. They | Mailadresse im Header
Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402
Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421
