-
Notifications
You must be signed in to change notification settings - Fork 68
Change normative language in Microsyntax non-normative section #627
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rather than a new PR, which pretends that the discussion in this PR #627 didn't happen, the changes now in PR #676 should have been incorporated here, via a suggestion like this --
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
evan made a new pr because this one had unresolvable merge conflicts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, that's frustrating, on multiple levels.
In future, best to comment about such "unresolvable merge conflicts" when closing the PR.
(I've never seen "unresolvable merge conflicts," only "merge conflicts that take significant time and effort to resolve." When I've been involved in such cases, I've made use of an external text editor, usually BBEdit, to manually compare the
>>>and<<<sections on a character-by-character level and produce a clean-up commit. I'd be happy to do so for future PRs that are so "unresolvable". Note that I'd need to be granted some extra permissions on the repo, which I'd only use for production of such conflict resolution commits.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@TallTed let's say that the PR was not resolvable with my level of attention and skill, and that it was significantly easier to do without a merge. If in the future it seems like it would be better to have someone untangle the merges, I'll definitely tag you in!