Skip to content
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
wants to merge 30 commits into
base: feature/release-inline-messages
Choose a base branch
from

Conversation

mrehan27
Copy link
Contributor

part of: MBL-824

Changes

Merged non-conflicting changes from feature/inline-inapp-snapshot.5 into main using following steps:

  • git merge --no-commit --no-ff feature/inline-inapp-snapshot.5
  • Resolved conflicts by running git checkout --ours "path-to-conflicting-file" for all conflicting files, reverting them to main version
  • Added the changes with git add . and committed them

Please 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.

levibostian and others added 30 commits May 30, 2024 15:04
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.
@mrehan27 mrehan27 self-assigned this Jan 14, 2025
Copy link

github-actions bot commented Jan 14, 2025

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.


  • CocoaPods-FCM: Build failed. See CI job logs to determine the issue and try re-building.
  • APN-UIKit: Build failed. See CI job logs to determine the issue and try re-building.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants