From 8528856c506f64f2637d155c3e69299e7dd12e05 Mon Sep 17 00:00:00 2001 From: Sergio Rojas <48057303+hisergiorojas@users.noreply.github.com> Date: Sat, 25 Nov 2023 15:38:54 -0800 Subject: [PATCH] Update pull.yml --- .github/pull.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/pull.yml b/.github/pull.yml index 04b55e4dc8..75cb88407c 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -1,12 +1,6 @@ version: "1" rules: - - base: bazzite-main - upstream: ublue-os:main - mergeMethod: hardreset - mergeUnstable: false - base: main - upstream: bazzite-main + upstream: ublue-os:main mergeMethod: merge mergeUnstable: false -label: ":arrow_heading_down: pull" -conflictLabel: "merge-conflict"