21.08 Meteor report

[allison-wing]

21.08 Meteor report

[allison-wing]

Ugh, you are right. I will fix it and do another pull request

Get Outlook for iOShttps://aka.ms/o0ukef

---

From: Lukas Kluft @.> Sent: Thursday, August 22, 2024 9:38:12 AM To: orcestra-campaign/book @.> Cc: Allison Wing @.>; Author @.> Subject: Re: [orcestra-campaign/book] 21.08 Meteor report (PR #205)

@lkluft requested changes on this pull request.

---

In orcestra_book/reports/METEOR-20240821.mdhttps://github.com/orcestra-campaign/book/pull/205#discussion_r1726808860:

+report_id: METEOR-20240820 +pi: "Allison Wing" +date: 2024-08-20

I think both the report date and ID haven't been updated

— Reply to this email directly, view it on GitHubhttps://github.com/orcestra-campaign/book/pull/205#pullrequestreview-2254157623, or unsubscribehttps://github.com/notifications/unsubscribe-auth/ASQYCCD2V3JRUN7IFYTPLHLZSW5RJAVCNFSM6AAAAABM5AK2OGVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDENJUGE2TONRSGM. You are receiving this because you authored the thread.Message ID: @.***>

[lkluft]

Ugh, you are right. I will fix it and do another pull request

You don't need to do another pull request :) If you simply commit the changes and push to the branch, it is included in the PR. But if you are at it, could you also [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing your branch? This would add the latest changes but without the spurious merge commits

Depending on your local setup, the workflow should simply be:

git fetch upstream
git rebase upstream/main

[allison-wing]

I think I changed it and committed the changes and pushed back to the branch

[lkluft]

I think I changed it and committed the changes and pushed back to the branch

I think something went wrong with the rebase, but it's hard to debug remotely. I fixed and force-pushed the branch and we can merge :)

I would suggest that you delete your local branch and create a new one from the latest `main' branch. Let me know if you encounter any problems with this approach