fork
cloning a specific branch
-
clone the repo
$ git clone https://github.com/gree2/mondrian.git
-
list avaiable branches
$ git branch -a
-
checkout the branch you want to work
$ git checkout 4.4
adding upstream and local settings
-
keep your repo uptodate with pentaho mondrian repo
$ git remote add upstream git://github.com/pentaho/mondrian.git
-
disable fast-forward during merges
# to preserve the entire commit history # and properly track file changes $ git config --add merge.ff false
merging upstream changes
-
to update and merge changes from the upstream repo
# where [branch] is the current branch you're working on $ git fetch upstream [branch] $ git fetch upstream/[branch]
-
if no merge conflict, your local repo is now uptodate
verifying the coding style
-
run following command
$ ./bin/checkFile.sh --under [e.g. "./src"]