Merged PRs

dolt

10523: Fix non-interactive rebase to checkout branch on conflict
This bug was introduced when we removed the need to use the --interactive flag.
10517: /go/store/blobstore/internal/git/runner.go: force english in git subprocesses
10516: Allow restrictions in branch control
This allows for inserting (and updating to) restrictions within the dolt_branch_control table. Previously, we attempted to prevent subsets by checking if the existing rows fully encapsulated the new row. While this is true for matching, it's not true in the logical sense, as a restriction matches both but overrides other matches. This change makes that distinction by always allowing insertion when there are different permissions.