aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2022-06-15 05:06:19 +0200
committerM.Gergo2022-06-15 05:06:19 +0200
commita0708452773c042da064afa283c0b798083aec49 (patch)
tree8c10576575b28c3c35293a4f683fac84dff5b25e
parent76101cb56ec835a76ec52ea88e5ab08acdc63145 (diff)
parent2cf0aa4f144d6d9cdee9513f4f76610e8c56ccae (diff)
downloadmayor-a0708452773c042da064afa283c0b798083aec49.tar.gz
mayor-a0708452773c042da064afa283c0b798083aec49.zip
Merge branch 'devel' into MaYor-devdevel
-rw-r--r--egyéb/test.txt2
-rwxr-xr-xmerge.sh6
2 files changed, 7 insertions, 1 deletions
diff --git a/egyéb/test.txt b/egyéb/test.txt
new file mode 100644
index 00000000..a2e68a37
--- /dev/null
+++ b/egyéb/test.txt
@@ -0,0 +1,2 @@
+
+aaa \ No newline at end of file
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