You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@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.
The text was updated successfully, but these errors were encountered:
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 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.
The text was updated successfully, but these errors were encountered: