mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-25 12:08:30 +00:00
91487a0b23
# Which Problems Are Solved When changes are pulled or pushed from or to a login repository, they can't be merged to zitadel, because the commit histories differ. # How the Problems Are Solved Changed the commands to allow diverging commit histories. Pulling takes a lot of commits into the zitadel repo branch like this. This is fine, as we anyway squash-merge PRs to a single commit. So we don't care about a branches commit history. # Additional Changes Added an exception to the close-pr.yml workflow so sync PRs are not auto-closed. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Florian Forster <florian@zitadel.com> Co-authored-by: Max Peintner <peintnerm@gmail.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>