« Previous - Version 25/91 (diff) - Next » - Current version
wolffy.au, 08/21/2011 12:40


GIT Branching Model

We follow the same branching model as ACE, based up http://nvie.com/git-model

If you are committing any code, ensure you don't commit directly to master (this is not in practice yet).

To create a change log, make sure you're in the release branch:

git log --no-decorate --no-merges --format="%B" > temp.txt

To merge a release branch to master post release:

git checkout master
git merge --no-ff release-<version>
git tag -a v<version>
git push --tags

To delete a remote branch:

git branch -d <branch>
git push origin :<branch>

To rollback a remote commit:

git reset --hard <sha5>
git push -f origin <sha5>:<branch>

To merge your <branch> back into develop branch:

git stash save (optional)
git checkout develop
git rebase --no-ff <branch>
git push origin develop

To cherry-pick merge your commits back into develop branch:

git checkout develop

Right-click on commit and cherry-pick. Once completed:
git push

Where is MSO mentioned?

What islands are MSO ready?

MSO Logos


UseCaseDiagram.png - MSO Use Case Diagram (168.3 kB) Tupolov, 03/17/2012 19:54

MSO20121110.sql - SQL DUMP (2012 11 10) for MSO 4.5 PDB (50.7 kB) highhead, 11/17/2012 10:59

MSO20130208.sql - SQL DUMP (2013 02 08) for MSO 4.6 PDB (20.9 kB) highhead, 03/04/2013 20:45

@Arma2NET.7z - @Arma2NET folder required for MSO 4.5+ (431.2 kB) highhead, 03/04/2013 20:49