[FFmpeg-devel] forgejo merge vs approve

[Alexander Strasser]

On 2025-08-03 17:04 +0200, Timo Rothenpieler wrote:
> On 8/3/2025 3:26 PM, Michael Niedermayer wrote:
> > On Sun, Aug 03, 2025 at 01:45:17PM +0200, Timo Rothenpieler wrote:
> > > On 8/3/2025 9:41 AM, Michael Niedermayer wrote:
> > > > Hi
> > > > 
> > > > can we have a tag that causes "automerge on approve" ?
> > > > 
> > > > so that if i open a pr i can set that tag and if someone approves it, its
> > > > merged and i dont have to come back and click that button ?
> > > 
> > > That is how it should already work normally.
> > > If there is no approval, the merge button turns into a "Auto-Merge when
> > > checks succeed", and "at least one approval" is said check.
> > > 
> > > Not sure if being an admin lets you bypass that, but at least I also see the
> > > "Rebase then fw (When checks succeed)" button.
> > 
> > ok lets see if that works
> > I saw one button and i clicked it on
> > "https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20093"
> > 
> > lets see if it waits for an approval :)
> > 
> > btw how exactly does that work when a pull request crosses the area
> > of knowledge of 5 people ?
>
> You probably shouldn't mark such PRs for auto-merge on approval.
> I'd only use it on more or less obvious/trivial things.

Fully agree with Timo.

One should act responsibly and only use auto-merge on very small, mostly
trivial changes.

For bigger stuff I think it's best to let either the main author or the
main reviewer do the merge.

Where the author is only possible when they have write access and
with main reviewer I mean a reviewer that fully reviewed the changes and
not only partially.

This is usually the best option because they have a better mental model
of how things work and what gets changed and don't want to introduce
errors themselves when actively merging the changes. So things that might
have been not found yet still have a good chance to pop up last minute.


  Alexander