@kreyren I'm not sure I see the whole picture, but honestly the developers seem reasonable from what I read.
BTW,If you are recreating a branch via cherry picking, you should use git rebase --onto instead, it's conceptually the same but far less pain for you. See https://matthew-brett.github.io/pydagogue/rebase_without_tears.html. This usually turns conflict hell into "ok rebased", or at least a lot less to fix.
@ambihelical I think i tried that already the rebasing is just annoying but like tolerable it's more like them being dipshits with ego beyond the moon and arguing over everything instead of merging things that i worked on for 2 weeks