https://kotlinlang.org logo
Title
j

John O'Reilly

04/07/2023, 6:48 PM
getting a compilation error building code in
main
for some reason
e: file:///Users/joreilly/dev/github/Confetti/shared/src/androidMain/kotlin/dev/johnoreilly/confetti/work/SessionNotificationSender.kt:61:14 Unresolved reference: data
maybe some merge issue
y

yschimke

04/07/2023, 6:50 PM
I can take a look.
j

John O'Reilly

04/07/2023, 6:51 PM
I think some conflict perhaps with https://github.com/joreilly/Confetti/pull/544/files
and last changes
not sure why GH didn't recognize that
I think this is the difference between different job types.
j

John O'Reilly

04/07/2023, 6:53 PM
looks good now
y

yschimke

04/08/2023, 10:18 AM
I guess this is the solution? https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue The one I was thinking of was pull_request_target, but I don't think it solves this. I don't think we need a merge queue, so maybe live with occasional merge conflicts.