Testing how to handle feature branches with git