Skip to content
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

Restore overwrites and update links from prior merge #134

Closed
wants to merge 1 commit into from

Conversation

justinwb
Copy link
Member

@justinwb justinwb commented Sep 3, 2019

The merge of #95 introduced a number of changes into the process documentation.

#83 added links throughout the documentation, and was merged shortly after. However, the pull request for #83 was submitted several weeks before #95 was completed. While it looks like most of the conflicts were correctly resolved, there were two cases where the language approved as part of the #95 merge was overwritten with earlier versions, at lines 55 and 69 (see the Files Changed tab). This pull request restores the approved language as it was written in #95 (with the addition of links at line 69 to maintain consistency with the changes from #83).

Two additional items identified and addressed by this pull:

  1. Because include reference to links #83 was written before the repository name was changed, it was still referring to the previous repository address - solid/culture. That reference has been updated to the current address of solid/process.
  2. At the time that include reference to links #83 was written, there was not an approved definition of what constitutes Supporting Documentation from an editorial standpoint. With the passage of Add editor assignments, permission scheme, and substantive changes #95, this was defined in editors.md. Those link references have also been updated to link there instead.

I believe this pull should only require standard editorial review, since the changes proposed are meant to align documentation with the material that @timbl has already approved.

@Mitzi-Laszlo
Copy link
Contributor

These links are no longer in the editorial process so this pull request could be closed?

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