How do you go about pushing after editing the master branch? Do you checkout the heroku branch and merge? Wouldn’t that overwrite the .gitignore?

Thanks