I have a project in Github with 2 branches, [master] and [production]. I linked them with Heroku's pipeline and made it deploy automatically from [master] (but not for [production]) . So whenever my team pushes code into the master branch, the project hosted on Heroku is automatically updated and we can see the changes in the web application. Also, there is now a [Promote to production...] button available.
When I clicked this button, the [production] web application was updated with no issues, but the codes in github under the [production] branch was still the old one.
Earlier, I had changed one config file in the production branch manually (to match the production environment) so it now says [This branch is 1 commit ahead, xx commits behind master.] Maybe I have to resolve this first before I promote to production?? Can I do this in the Github UI in the browser?
Heroku integrates with GitHub to make it easy to deploy code living on GitHub to apps running on Heroku. When GitHub integration is configured for a Heroku app, Heroku can automatically build and release (if the build is successful) pushes to the specified GitHub repo.
You're seeing the correct behaviour. Heroku's GitHub Integration lets you automate Heroku deploys based on pushes to your GitHub repository. It isn't supposed to go the other way.
This is a good thing. What would you expect to happen in the case of a merge conflict?