search

p4lang / p4runtime

Specification documents for the P4Runtime control-plane API
Apache License 2.0
140 stars 86 forks source link

sync main to generic-table-dev #469

Closed saynb closed 5 months ago

chrispsommers commented 7 months ago

Does this replace https://github.com/p4lang/p4runtime/pull/468 ? Do you intend to resolve the conflicts in this PR?

saynb commented 7 months ago

Does this replace #468 ? Do you intend to resolve the conflicts in this PR?

  • thanks

I am not sure how to fix the merge conflicts on this PR since it is a PR from main to generic-table-dev and not from any other private branch. Created this to ensure that there are merge conflicts

chrispsommers commented 7 months ago

@antoninbas Do you have any advice for @saynb to fix the merge conflicts?

saynb commented 7 months ago

@antoninbas Do you have any advice for @saynb to fix the merge conflicts?

The merge conflicts are showing up in go.mod and go.sum. One option is we can raise a separate PR to merge those files in generic-table-dev first, then create this merge. Second option which might be cleaner is to just force generic-table-dev to be the same as current top of main since nothing different has gone in that dev branch yet. What do you think ?

antoninbas commented 7 months ago

It should not be too hard to resolve merge conflicts. Just reset these 2 files to the version on the main branch, update them with ./codegen/update.sh, and commit the changes. That should take care of it.

saynb commented 7 months ago

It should not be too hard to resolve merge conflicts. Just reset these 2 files to the version on the main branch, update them with ./codegen/update.sh, and commit the changes. That should take care of it.

That's what I had done with https://github.com/p4lang/p4runtime/pull/468 , but we were wondering if there was a cleaner way

saynb commented 5 months ago

Closing this since resolving with https://github.com/p4lang/p4runtime/pull/468 instead