Propose: fix typo of variable $activity plus a few more

[jeis4wpi]

Propose: fix typo of variable $activity plus a few more

[Alex-Jordan]

Something about this seems off. There should not be any merge commits. Can you do get fetch origin, and then git rebase origin/develop? Or something like that.

I wont claim my workflow is best, but for webwork2 and pg, I would keep the local develop branch aligned with the remote develop branch. And if there is a new commit like fixing a typo, create a separate branch for that with a descriptive name like typo.

[jeis4wpi]

Sorry. I can rebase or close PR. * John

…

________________________________ From: Alex Jordan ***@***.***> Sent: Sunday, January 18, 2026 5:00:40 PM To: openwebwork/webwork2 ***@***.***> Cc: John Eismeier ***@***.***>; Author ***@***.***> Subject: Re: [openwebwork/webwork2] Propose: fix typo of variable $activity plus a few more (PR #2891) [https://avatars.githubusercontent.com/u/4732672?s=20&v=4]Alex-Jordan left a comment (openwebwork/webwork2#2891)<#2891 (comment)> Something about this seems off. There should not be any merge commits. Can you do get fetch origin, and then git rebase origin/develop? Or something like that. I wont claim my workflow is best, but for webwork2 and pg, I would keep the local develop branch aligned with the remote develop branch. And if there is a new commit like fixing a typo, create a separate branch for that with a descriptive name like typo. — Reply to this email directly, view it on GitHub<#2891 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AKFTXFWSJU4S2RE2F6GMCEL4HP7ARAVCNFSM6AAAAACSC7KI62VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTONRVG44TCNJYHA>. You are receiving this because you authored the thread.Message ID: ***@***.***>

[drgrice1]

Just do git fetch origin and then git rebase origin/develop. No need to close the pull request.