From d2a984e176192a3bfb8ae7a7ca0155b5c1820561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 15 Apr 2020 10:02:51 +0100
Subject: [PATCH] update-nur-search: do a git pull before push.

Reduce potential conflicts on push
---
 ci/update-nur-search.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/update-nur-search.sh b/ci/update-nur-search.sh
index 2030bba2b..96d87595d 100755
--- a/ci/update-nur-search.sh
+++ b/ci/update-nur-search.sh
@@ -26,6 +26,7 @@ cd nur-search
 if [[ ! -z "$(git diff --exit-code)" ]]; then
     git add ./data/packages.json
     git commit -m "automatic update package.json"
+    git pull --rebase origin master
     git push origin master
     nix-shell --run "make && make publish"
 else