aboutsummaryrefslogtreecommitdiffstats
path: root/merge.sh
blob: 1080edb15aaca8533d2ff98bc517831dd6188601 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
#!/bin/bash

git checkout master
git fetch update
git fetch origin


git checkout MaYor-dev
git pull update master
git merge devel


git checkout master
git merge MaYor-dev