From 80e60ede1adaa8ec68fd1a6fc59cac78b6924473 Mon Sep 17 00:00:00 2001 From: 0FL01 Date: Wed, 23 Jul 2025 12:03:54 +0300 Subject: [PATCH] fix conflict --- .github/workflows/flatpak-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml index 3aee624111..755681003b 100644 --- a/.github/workflows/flatpak-build.yml +++ b/.github/workflows/flatpak-build.yml @@ -31,6 +31,7 @@ jobs: git checkout dev echo "Слияние изменений из upstream/dev..." git merge upstream/dev --no-edit + git pull --rebase origin dev git push origin dev - name: Get latest version and create release tag