spring-projects / spring-data-examples

Spring Data Example Projects
Apache License 2.0
5.17k stars 3.39k forks source link

Additions to Couchbase transactions example. #651

Closed mikereiche closed 1 year ago

mikereiche commented 1 year ago

Closes #650.

mp911de commented 1 year ago

We finally merged the upgrade to Spring Boot 3.0.2. Can you sort out this and #649 in terms of rebasing and which one of these two we should merge.

Also, please refrain from sysouts in the tests.

mp911de commented 1 year ago

Care to rebase your PR?

mikereiche commented 1 year ago

I just resolved the conflicts - I didn't "git rebase". Let me know if that is not sufficient. Thanks.

mp911de commented 1 year ago

Please use indeed git rebase and force-push as we keep a linear git history without merge commits.