aboutsummaryrefslogtreecommitdiffstats
path: root/merge.sh
blob: 8595bcfd0a7f692b444fab71f350e28c93691fc0 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12

#!/bin/bash

git checkout master
git pull local/master MaYor-dev

git checkout MaYor-dev
git merge devel

git checkout master
git merge MaYor-dev
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 00:02:21 +0000