-
Notifications
You must be signed in to change notification settings - Fork 23
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
chore: merge non-conflicting changes from inline in-app feature branch #848
Draft
mrehan27
wants to merge
30
commits into
feature/release-inline-messages
Choose a base branch
from
rehan/inline-inapp-messages-merge
base: feature/release-inline-messages
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
chore: merge non-conflicting changes from inline in-app feature branch #848
mrehan27
wants to merge
30
commits into
feature/release-inline-messages
from
rehan/inline-inapp-messages-merge
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
… View (#724) Co-authored-by: Ahmed Ali <[email protected]>
… indicator View (#766)
Co-authored-by: Levi Bostian <[email protected]>
Co-authored-by: Levi Bostian <[email protected]>
In order for us to determine what API calls are coming from the snapshot builds. Used branch name for SDK version as easy way for our team to reference the build of the SDK that's running. Testing: * See this slack thread mentioning the SDK version can contain a '/' character https://customerio.slack.com/archives/C01QYDKD0SU/p1686002124298969 * I ran sample app on device and sent some HTTP requests. Viewed activity logs in Journeys to confirm the user-agent contained the updated SDK version. Lastly, you can view network requests to fly.customer.io/logs to see what SDK version got returned from the CIO API. The response contained the full SDK version, including '/' character.
Sample app builds 📱Below you will find the list of the latest versions of the sample apps. It's recommended to always download the latest builds of the sample apps to accurately test the pull request.
|
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.
part of: MBL-824
Changes
Merged non-conflicting changes from
feature/inline-inapp-snapshot.5
intomain
using following steps:git merge --no-commit --no-ff feature/inline-inapp-snapshot.5
git checkout --ours "path-to-conflicting-file"
for all conflicting files, reverting them tomain
versiongit add .
and committed themPlease refer to linked ticket for detailed plan and next steps.
Note
This commit does not compile and only merges non-conflicting files to
main
to reduce the size of future changes, making them easier to review.