search

phpversions / phpversions.info

Which hosts support which PHP versions, and which is default
http://phpversions.info
The Unlicense
118 stars 141 forks source link

June 2020 Heroku updates #586

Closed dzuelke closed 4 years ago

dzuelke commented 4 years ago

https://devcenter.heroku.com/changelog-items/1816

dzuelke commented 4 years ago

(FWIW, I'd appreciate a non-squashed merge or normal FF, since I keep my branch around and always git merge upstream/master before edits; this time, this caused some commit duplication... I guess this happened last time because a few PRs were merged before mine?)

colinodell commented 4 years ago

Sure thing! Would "create a merge commit" work for you?

image

dzuelke commented 4 years ago

Yes that works :)

https://help.github.com/en/github/administering-a-repository/about-merge-methods-on-github explains in a bit more detail why this is better for long lived branches.

Thanks!