From 0c06679e5f49c50b1a15f544b33a4b9bc810edec Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Tue, 25 Jun 2019 10:59:18 +0200 Subject: [PATCH] Update sync scripts Signed-off-by: Severin Kaderli --- system/.local/bin/sync-notes | 2 +- system/.local/bin/sync-tasks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/.local/bin/sync-notes b/system/.local/bin/sync-notes index 4d47aae..7dda257 100755 --- a/system/.local/bin/sync-notes +++ b/system/.local/bin/sync-notes @@ -24,7 +24,7 @@ if [ "${IS_WORK}" = "1" ]; then fi cd "/home/severin/notes" || exit -git pull +git pull -X theirs git add --all git commit -s -m "Update notes" git push origin master diff --git a/system/.local/bin/sync-tasks b/system/.local/bin/sync-tasks index b0c4124..3595b98 100755 --- a/system/.local/bin/sync-tasks +++ b/system/.local/bin/sync-tasks @@ -27,7 +27,7 @@ if [ "${IS_WORK}" = "1" ]; then fi cd "/home/severin/tasks" || exit -git pull +git pull -X theirs git add --all git commit -s -m "Update tasks" git push origin master