testing git flow with rebase instead of merge workflow