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
I goofed the previous merge when I mis-edited the commit message + then manually corrected it.
It seems I inadvertently added back this change, which I thought I'd excluded but I probably squashed together in error.
Can someone attend @marqh@djkirkham ?
I just broke master, so let's not skip a review process again !
I have just double-checked that all commits from the last 2 PRs did get included.
What happened:
I merged from @djkirkham original PR #2240, the single commit here
I realised I had messed up writing the squashed commit message online.
So I checked out the new master, edited the commit message with "commit --amend" and modified the master direct with "push upstream/master -f"...
I did it that way because I specifically wanted to fix a broken commit message, so a PR wouldn't address it.
It looks like I included the change from @marqh additional commit, which I had not intended to include, and which I failed to purge when checking out the latest version of upstream/master.
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.
I goofed the previous merge when I mis-edited the commit message + then manually corrected it.
It seems I inadvertently added back this change, which I thought I'd excluded but I probably squashed together in error.
This fixes.