tracking: Fix in-flight collision of two related PRs #2867
Merged
Conversation
This file contains 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
Unfortunately, I forgot to rebase before renaming trackMixpanelEvent() and a PR adding a new trace point was already in-flight. More precisely: - #2861 renames trackMixpanelEvent() to trackAnalysticsEent() - #2857 add a new trackMixpanelEvent() call. Each PR is fine, but with the merge of both without rebasing any, we end up with master having a dandling call to trackMixpanelEvent().
dlespiau
force-pushed
the
2017-09-26-mixpanel-cleanup.2
branch
from
c53f05a to
53f1890
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Unfortunately, I forgot to rebase before renaming trackMixpanelEvent() and a PR
adding a new trace point was already in-flight.
More precisely:
to trackAnalysticsEent()
trackMixpanelEvent() call.
Each PR is fine, but with the merge of both without rebasing any, we end up
with master having a dandling call to trackMixpanelEvent().