inferno-framework / uds-plus-test-kit

Conformance Testing for the UDS+ Implementation Gudie
Apache License 2.0
3 stars 3 forks source link

1.0.0 Updates #15

Closed ljtucker closed 1 year ago

ljtucker commented 1 year ago

See this ticket for list of updates.

Important notes:

arscan commented 1 year ago

FYI there was a merge conflict on the "version" related files because you hadn't pulled down the latest commits here (I needed to bump the version on this side to deploy a new version). I just did the 'resolve merge conflict' in GitHub, which merges this main back into your PR branch. Just make sure that the commits on your main branch matches the commits on this main branch on here exactly next time you make changes so there is a clean merge. Let me know if you need help w/that or think there is a better strategy for managing keeping these repos in sync!

ljtucker commented 1 year ago

Thanks for fixing the merge conflict! Sorry, I had clicked the "sync fork" button on GitHub before starting and thought that would update the repo, but I guess it did not pull all the updates. Next time I'll be sure to double check!

arscan commented 1 year ago

Thanks for fixing the merge conflict! Sorry, I had clicked the "sync fork" button on GitHub before starting and thought that would update the repo, but I guess it did not pull all the updates. Next time I'll be sure to double check!

Strange! No problem, just FYI to keep this as smooth as possible in the future. The PR will state thee is a merge conflict at hte bottom, so you can just double check that doesn't show up next time.