From 728793ad1ee7f40020297f90635d3cea392af68b Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Wed, 15 Jun 2022 05:00:53 +0200
Subject: merge2

---
 merge.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'merge.sh')

diff --git a/merge.sh b/merge.sh
index 8595bcfd..1080edb1 100755
--- a/merge.sh
+++ b/merge.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 
 git checkout master
-git pull local/master MaYor-dev
+git fetch update
+git fetch origin
+
 
 git checkout MaYor-dev
+git pull update master
 git merge devel
 
+
 git checkout master
 git merge MaYor-dev
 
-- 
cgit v1.2.3