eclipse-uprotocol / up-transport-zenoh-cpp

C++ client library to connect to the zenoh implementation of uProtocol
Apache License 2.0
5 stars 15 forks source link

Feature/1 5 7 alignment #22

Closed MelamudMichael closed 7 months ago

gregmedd commented 7 months ago

@MelamudMichael - Now that #21 is merged, I made an attempt at rebasing this PR onto main. By comparing the two PRs, the interactive rebase commit list I came up with was:

pick 2b4f1d0 fixing tests compilation
pick 0ead633 fixing tests
pick 7afa00c adding mutex
pick ad9646e cleanup
pick c8700dc fixing unit tests
pick d9eae0d compilation fix
pick 2c032f5 adding latency test
pick 8b3b7e6 code cleanup
pick 031cb70 adding bost and cleaning the latency test
pick 012dc30 resolving code review comments

For each commit with conflicts, I looked at the original commit to see what changes were intended, then attempted to apply only those changes to the resolution. This resulted in eight commits with a small set of changes.

If you agree that looks like the right list of commits and changes, you can update this PR by running these commands:

git switch feature/1_5_7_alignment
git branch backup/feature/1_5_7_alignment
git remote add greg git@github.com:gregmedd/up-client-zenoh-cpp.git
git fetch greg
git checkout greg/feature/1.5.7/pull-22-rebase
git branch -D feature/1_5_7_alignment
git switch -c feature/1_5_7_alignment
# OPTIONAL: fetch main from eclipse-uprotocol/up-client-zenoh-cpp and use
# something like "git rebase -i eclipse/main" to squash and reword the commits.
git push -f -u origin feature/1_5_7_alignment
git remote remove greg

(note: Assumes origin upstream is your fork of this repo, and that you do not already have my fork as a remote. Modify as needed.)

The optional git rebase -i eclipse/main step is not required, but definitely recommended - squashing everything to one (or a few) commit(s) and updating the commit message to describe the changes would help keep the commit log clean and easy to understand.