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
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
@TylerMatteo Despite much effort, I have not been able to resolve "This branch cannot be rebased due to conflicts". I don't think there's actually an issue. Otherwise, this is ready for review.
@TylerMatteo Despite much effort, I have not been able to resolve "This branch cannot be rebased due to conflicts". I don't think there's actually an issue. Otherwise, this is ready for review.
It likely has something to do with the merge commit merging develop back onto this branch. I'll enable squash merging for now and, assuming it lets us do that, we can do that for this PR. I was going to suggest squashing at least some of these commits anyway. Long term, we should sit down and figure out how to do rebasing instead of merge commits with Git Tower because this problem will continue to come up.
@TylerMatteo Despite much effort, I have not been able to resolve "This branch cannot be rebased due to conflicts". I don't think there's actually an issue. Otherwise, this is ready for review.
It likely has something to do with the merge commit merging develop back onto this branch. I'll enable squash merging for now and, assuming it lets us do that, we can do that for this PR. I was going to suggest squashing at least some of these commits anyway. Long term, we should sit down and figure out how to do rebasing instead of merge commits with Git Tower because this problem will continue to come up.
I did rebase in Git Tower - no idea how it turned out like that.
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.
Summary
Adds polling to check for completed subscriber creation, and logs any errors to Papertrail and Sentry.
Tasks/Bug Numbers
Completes #1564
Technical Explanation
Any other info you think would help a reviewer understand this PR?