svn approach always merge origin/master onto branch
Merge branch 'master' into svnapproach