Skip to content

Update to Jan 18 meeting decisions #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Jan 26, 2024
Merged

Update to Jan 18 meeting decisions #60

merged 28 commits into from
Jan 26, 2024

Conversation

NSoiffer
Copy link
Contributor

No description provided.

NSoiffer and others added 27 commits December 7, 2023 22:50
playing around display

playing around display

playing around display

playing around display

added more entries based on Dec 7 meeting

fix typos

added more entries based on Dec 7 meeting

fix typos

fix indentation

fix typos

fix typos
playing around display

playing around display

playing around display

playing around display

added more entries based on Dec 7 meeting

fix typos

added more entries based on Dec 7 meeting

fix typos

fix indentation

fix typos

fix typos
This removed/coalesced repeat entries
@NSoiffer
Copy link
Contributor Author

I think I need to take a tutorial on using forks, but this shouldn't have conflicts -- I updated before I made changes.

@davidcarlisle: can you resolve them -- I scanned through and you should just take all the incoming ones.

Thanks.

@dginev
Copy link
Contributor

dginev commented Jan 26, 2024

@NSoiffer I have been productively using git rebase as my primary workflow for what appears to be a decade now. There are many tutorials online, this is a reasonable recent one:
https://simondosda.github.io/posts/2022-01-03-git-rebase-workflow.html

I've been burned by diverging forks using merge back in the SVN days, and even though git does it substantially better, you can still rewrite history without realizing it.

The rebase pain points are a little different, but they tend to mostly come up with long-lived branches that have strayed too far away from the mainline history. And a squash allows to avoid most of that pain as well (and github makes squashing easy from the UI here). For short-lived branches rebase works quite reliably.

@davidcarlisle davidcarlisle merged commit f9aaec6 into w3c:main Jan 26, 2024
@davidcarlisle
Copy link
Collaborator

@NSoiffer git is happy, you might want to check that you are

@davidcarlisle
Copy link
Collaborator

@NSoiffer

https://w3c.github.io/mathml-docs/intent-core-concepts/#calculus

has lost its first column, presumably a yaml glitch I'll sort out locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants