gravitystorm left a comment (openstreetmap/openstreetmap-website#6393)
Happy to merge, but there's a Gemfile.lock conflict now. You'll either need to
rebase this, or teach me how to handle these situations cleanly.
(I don't like merging and and fixing things up locally, in case I mess up the
lockfile, but if there's a way to do it that updates the PR, keeps credit for
the original author, and also runs CI, then I'm all ears :smile: )
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/6393#issuecomment-3303641879
You are receiving this because you are subscribed to this thread.
Message ID:
<openstreetmap/openstreetmap-website/pull/6393/c3303641...@github.com>
_______________________________________________
rails-dev mailing list
rails-dev@openstreetmap.org
https://lists.openstreetmap.org/listinfo/rails-dev
