Updated meeting information and meeting link.
I also made a couple of edits to the wording on our events to characterize the focus of fedora diversity events a little bit.
Hi @ashlyna, it looks good to me! But there is a merge conflict with some of the latest changes on master branch. Could you please take a look and resolve the merge conflict?
master
If it is tricky, I can share a few tips for fixing a merge conflict. Let me know!
Metadata Update from @jflory7: - Pull-request tagged with: improvement, needs changes, type - docs, type - internal organization - Request assigned
Metadata Update from @jflory7: - Pull-request untagged with: needs changes
Metadata Update from @jflory7: - Pull-request tagged with: blocked
Keeping this Pull Request open for now. We will look at it during the Docs Mentorship Hour next Thursday for a short overview on git rebase.
git rebase
Metadata Update from @jflory7: - Pull-request untagged with: blocked
@ashlyna / @lilyx and I followed up today on this Pull Request, but were unable to debug live because of login issues with Pagure (see fedora-infrastructure#9406). But we were still able to review interactive and normal git rebase and how to do that for this repo:
We worked on a temporary GitHub mirror of this repository. So once we figure out the Pagure login issues, Ashlyn should be able to jump back in and finalize this Pull Request.
@lilyx and I checked in earlier. Since she has a new FAS account, I am going to close out this Pull Request since it won't be updated.
To make the process easier, I pushed up the fixed changes from the old account to a new git branch here on this repo:
https://pagure.io/fedora-diversity/c/a2b131a6e8bedab10108bf92e5af10a8c25e4d08?branch=pr162-rebased
Will follow up with a change again soon!
Pull-Request has been closed by jflory7
Updated meeting information and meeting link.
I also made a couple of edits to the wording on our events to characterize the focus of fedora diversity events a little bit.