Attempt to rebase content-card onto develop [DO NOT MERGE] #265
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
…develop Conflicts: app/src/main/java/org/oppia/app/activity/ActivityComponent.kt
BenHenning
changed the base branch from
develop
to
introduce-image-parser-replica
…-card-from-develop Conflicts: app/src/main/java/org/oppia/app/activity/ActivityComponent.kt
BenHenning
changed the base branch from
introduce-image-parser-replica
to
introduce-image-parser-replica-up-to-date
|
@veena14cs consider using this as a base branch to replace #245 with a develop-based set of changes since it seems like some additional work is needed to decouple the content card work from the merge-fix branch. |
|
Old base branch that was never meant to be merged. |
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.
This is a manually rolled version of #245 that does not depend on merge-fix. Steps to create:
introduce-image-parser-replicato latest develop (I created a separate branch to avoid changing the current branch)git diff merge-fix..content-cardto create a patch file snapshot of Fix #161: Exploration player contentcard supports rich-text part [Blocked: #205] #245developand apply the patch usinggit apply --rejectto apply only the valid parts of the patch