re-authorize merge commits to main branch

[12rambau]

@blink1073 could you change the rules applied to the main branch and re-authorize merge commits as discussed in #237. I wanted to start merging bigger PR and only squash merges are allowed on main.

As a maintainer, I can do it in global config but I don't have enough rights to change branch rules.

[blink1073]

As I said, I think "Rebase and merge" is a much better option, it preserves the order of the history without having a merge commit.

[12rambau]

I tried on #268 and it's creating a conflict that cannot be solved from the GH interface. As @akhmerov and I were ok to go back to the previous workflow I thought it was just a matter of applying it. I'm sorry if I look stubborn but I really don't see the advantage of forcing the use of either squash or rebase compared to merge considering the drawbacks I already mentioned and seeing now that it requires extra work to do something that is transparent with the default merge.

EDIT: And writting that I'm asking myself in the absense of a merge commit will the autogenerated changelog from github continue to work?

[blink1073]

I will disagree and move on, I changed the policy.

[12rambau]

thanks a lot, I'm sure your method is better, we simply didn't face the need so we behave like spoiled child ;-)