File: merge-dev-to-master.sh

package info (click to toggle)
dosbox-x 2025.12.01%2Bdfsg-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 53,224 kB
  • sloc: cpp: 339,768; ansic: 165,257; sh: 1,455; makefile: 963; perl: 385; python: 106; asm: 57
file content (23 lines) | stat: -rwxr-xr-x 616 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
#!/usr/bin/env bash
curbranch=$(git branch --show-current)

if [[ "${curbranch}" == "master" || "${curbranch}" == "develop" ]]; then
    rm -f include/build_timestamp.h
    git checkout include/build_timestamp.h

    git checkout develop
    git pull
    git push

    rm -f include/build_timestamp.h
    git checkout include/build_timestamp.h

    git checkout master
    git pull
    git push

    rm -f include/build_timestamp.h
    git checkout include/build_timestamp.h

    git checkout master && git merge develop && git checkout develop && git merge master && git fetch --all && git push --all && make -j
fi