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.

Sign up for GitHub

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

Jump to bottom

Develop branch is broken #4602

Closed
BenHenning opened this issue Sep 20, 2022 · 3 comments · Fixed by #4621
Closed

Develop branch is broken #4602

BenHenning opened this issue Sep 20, 2022 · 3 comments · Fixed by #4621
Assignees
@BenHenning
Labels
Impact: Medium Moderate perceived user impact (non-blocking bugs and general improvements). Z-ibt Temporary label for Ben to keep track of issues he's triaged.

Comments

@BenHenning
Copy link
Member

Describe the bug
Two PRs were merged in succession that led to develop breaking, despite no conflicts.

To Reproduce
See develop branch.

Expected behavior
Develop shouldn't be broken.

Demonstration
N/A

Environment
N/A

Additional context
N/A
@BenHenning BenHenning added Impact: Medium Moderate perceived user impact (non-blocking bugs and general improvements). issue_type_infrastructure Z-ibt Temporary label for Ben to keep track of issues he's triaged. labels Sep 20, 2022
@BenHenning BenHenning self-assigned this Sep 20, 2022
@BenHenning BenHenning moved this from Needs Triage to In Progress: Being implemented in [Team] Developer Workflow & Infrastructure - Android Sep 20, 2022
@KevinGitonga
Copy link
Contributor

@BenHenning Had updated my branch and came across this error that might be causing the breakage https://github.com/oppia/oppia-android/blob/develop/app/src/main/res/values/color_defs.xml
#009C8A has two entries causing error during build

@seanlip
Copy link
Member

seanlip commented Sep 21, 2022

Great catch, @KevinGitonga -- thanks!

@JishnuGoyal @Akshatkamboj14 Per the blame file, it looks like this relates to both your PRs colliding: https://github.com/oppia/oppia-android/blame/develop/app/src/main/res/values/color_defs.xml. Would one of you be able to fix it, please?

@antonmagnus antonmagnus mentioned this issue Sep 21, 2022
Closed
@BenHenning BenHenning mentioned this issue Sep 22, 2022
Closed
6 tasks
@BenHenning
Copy link
Member Author

This was fixed in #4603.

Repository owner moved this from In Progress: Being implemented to Done in [Team] Developer Workflow & Infrastructure - Android Sep 22, 2022
@JishnuGoyal JishnuGoyal mentioned this issue Sep 24, 2022
Merged
6 tasks
BenHenning pushed a commit that referenced this issue Sep 24, 2022
@JishnuGoyal
Fix #4602, #4449: Modify the design of the chapter list in lessons tab (
dc23e47 
#4621)

Includes the fast-forward fix so that develop doesn't break.

Original PR: #4535.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@BenHenning BenHenning

Labels
Impact: Medium Moderate perceived user impact (non-blocking bugs and general improvements). Z-ibt Temporary label for Ben to keep track of issues he's triaged.
Projects
[Team] Developer Workflow & Infrastructure - Android
Archived in project
Milestone
No milestone
3 participants
@seanlip @BenHenning @KevinGitonga