git workflow feature branches and rebasing