Notices by raboof (raboof@merveilles.town)

@clacke yeah - it's still a huge pain in the butt though, especially with (re)moved files or when a merge contains fixes that are not directly visible to git as merge conflicts.

I guess you could say "don't do that then", but... too late for that ;)

More new git tricks:

A 'git rebase -i' allows you to edit a past commit. However, it will 'serialize' the history, losing any branch/merge 'structure' there might have been.

A 'git rebase -i --rebase-merges' keeps the branch/merge 'structure', however, it is not obvious how to 'edit' a merge commit.

You can, though: you can insert a 'break' in the rebase to edit and 'commit --amend' a merge commit.

https://stackoverflow.com/questions/9930637/edit-a-merge-commit-with-git-rebase

Unfortunately, you'll have to solve all merge conflicts again.

If you had "git rerere" enabled, it can at least have it re-solve 'both modified' conflicts for you, though you'll still have to explicitly 'add' them and it won't solve conflicts in added/removed files.

If you didn't have "git rerere" enabled yet, you can try "rerere-train.sh HEAD" https://raw.githubusercontent.com/git/git/master/contrib/rerere-train.sh

https://www.git-scm.com/book/en/v2/Git-Tools-Rerere

@gregory @ufoi I'm not convinced. I'll admit I don't manage a fediverse instance, but from my experience in other online spaces, all this emphasis on "due process", "evidence" etc sounds good in theory, but breaks down quickly in practice as it gets abused by bad actors who have fun "technically not breaking the rules". It is also putting the burden on the wrong side imho. Requiring participants to federate with instances from certain lists seems problematic.

@gregory @ufoi "The Problem" describes "those who block an instance often demand every instance they federate block the same instances as them, and if they do not, then they get added to the suspend list as well".

I agree such "transitive defederation" can be a problem when taken to extremes. To be honest I haven't really seen it happen "often" and without evidence, but possibly I wasn't paying attention.

The solution would be simply to "stop doing that", though :)