From 357cb76ce9b67b63cdb585c2139350cc34e0f57c Mon Sep 17 00:00:00 2001
From: Johannes Findeisen <you@hanez.org>
Date: Fri, 18 Jan 2019 21:28:48 +0100
Subject: [PATCH] forksync now uses merge not rebase

---
 bin/forksync.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/forksync.sh b/bin/forksync.sh
index 08b648c7..cfab4e66 100755
--- a/bin/forksync.sh
+++ b/bin/forksync.sh
@@ -9,8 +9,8 @@ for repo in /home/hanez/forks/*; do
 
     git checkout master
     
-    git rebase upstream/master
-    #git merge upstream/master
+    #git rebase upstream/master
+    git merge upstream/master
 
     git push -f origin master
 done