search

w3c / mathml-docs

Notes and other documents by the Math WG. See also https://github.com/w3c/mathml-core (repo for the MathML Core spec) and https://github.com/w3c/mathml (repo for the MathML 4 spec).
https://www.w3.org/Math/
Other
4 stars 10 forks source link

Update to Nov 9 meeting list #55

Closed NSoiffer closed 11 months ago

davidcarlisle commented 11 months ago

I approved the changes in principle but you need to rebase to avoid the merge conflicts

NSoiffer commented 11 months ago

I was trying to do that -- I thought I had updated. Should be updated now.

NSoiffer commented 11 months ago

I'm baffled -- I do the merge and push to my fork. But if I do a pull from the main (git pull upstream main), it is back to complaining about needing to a merge. I've gone through this cycle twice now.

What am I missing?

NSoiffer commented 11 months ago

@davidcarlisle: I did the merge in the browser and that seems to work.