getting a compilation error building code in `main...
# confettij
John O'Reilly
04/07/2023, 6:48 PMgetting a compilation error building code in
main Copy code
e: file:///Users/joreilly/dev/github/Confetti/shared/src/androidMain/kotlin/dev/johnoreilly/confetti/work/SessionNotificationSender.kt:61:14 Unresolved reference: dataJohn O'Reilly
04/07/2023, 6:49 PMmaybe some merge issue
y
yschimke
04/07/2023, 6:50 PMI can take a look.
j
John O'Reilly
04/07/2023, 6:51 PMI think some conflict perhaps with https://github.com/joreilly/Confetti/pull/544/files
John O'Reilly
04/07/2023, 6:51 PMand last changes
John O'Reilly
04/07/2023, 6:51 PMnot sure why GH didn't recognize that
y
yschimke
04/07/2023, 6:52 PMyschimke
04/07/2023, 6:52 PMI think this is the difference between different job types.
j
John O'Reilly
04/07/2023, 6:53 PMlooks good now
y
yschimke
04/08/2023, 10:18 AMI 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.
2 Views