tomhughes left a comment (openstreetmap/openstreetmap-website#6124)
Now you've managed to add a merge commit... Just do `git rebase -i master` and
then change the second commit from `pick` to `fold` and save and it should
squash the commits together and get rid of the merge. You'll need to `push -f`
afterwards to publish it.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/6124#issuecomment-2997983637
You are receiving this because you are subscribed to this thread.
Message ID:
<openstreetmap/openstreetmap-website/pull/6124/c2997983...@github.com>
_______________________________________________
rails-dev mailing list
rails-dev@openstreetmap.org
https://lists.openstreetmap.org/listinfo/rails-dev
