You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@MichaelChirico The merge from master looks odd in this PR. I either do a 'git merge master' locally and push, or a 'resolve conflicts' using the GitHub GUI. Both ways show as a single "Merge branch 'master' into better_list_assign" (theres a few above). But the latest merge master (that you did?) shows each commit to master separately (other PRs) and the 'files changed' tab doesn't match what I see locally; e.g. a binary file added in master from another PR is here in this PR but shows as a diff and there's no 'refresh' at the top so it's not that the diff tab hasn't updated yet.
I'll go ahead and merge. But for completeness just wondering what you did.
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.
Follow up to #3457
Satisfies the original expectation in #950