use "Fast-forward merge" for accepting merge requests
I think we should switch fdroiddata to accept merge requests with "Fast-forward merge":
"No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. When fast-forward merge is not possible, the user is given the option to rebase. "
Since fdroiddata has lots of commits by its nature, I think we want to reduce the number of commits if we can. git and related tools will start to slow down as it gets bigger, so we want to delay that as much as possible. Have you ever worked with a really big git repo? It can be quite painful. Since the vast majority of MRs in fdroiddata do not overlap with other ones, I think there will rarely be merge conflicts.
Another strategy is also use "Squash commits" as much as possible. Like if a MR only changes a single app, it should be squashed.
@mimi89999 @krt @licaon-kter @relan @grote @uniqx @est @xinxinxinxinxin @CiaranG