not using git-all - causes conflicts - using just git in war::default