Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Write + Conflict Resolution #496

Merged
merged 17 commits into from
Dec 21, 2022
Merged

Add Write + Conflict Resolution #496

merged 17 commits into from
Dec 21, 2022

Conversation

matt-ramotar
Copy link
Collaborator

Please see our contributing guidelines (contributing.md) primarily make sure to sign our cla as we cannot accept code externally without a signed cla

https://opensource.dropbox.com/cla/

Signed-off-by: mramotar <[email protected]>
Signed-off-by: mramotar <[email protected]>
Signed-off-by: mramotar <[email protected]>
Signed-off-by: mramotar <[email protected]>
Signed-off-by: mramotar <[email protected]>
Signed-off-by: Matt Ramotar <[email protected]>
Signed-off-by: Matt Ramotar <[email protected]>
Signed-off-by: mramotar <[email protected]>
Copy link
Contributor

@digitalbuddha digitalbuddha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fantastic start, few little issues otherwise LGTM :-D

Signed-off-by: mramotar <[email protected]>
digitalbuddha
digitalbuddha previously approved these changes Dec 21, 2022
@matt-ramotar matt-ramotar merged commit b3659e3 into main Dec 21, 2022
@matt-ramotar matt-ramotar deleted the matt-ramotar/write branch December 21, 2022 01:34
matt-ramotar added a commit that referenced this pull request Jan 3, 2023
* Stub Store write

Signed-off-by: mramotar <[email protected]>

* Format

Signed-off-by: mramotar <[email protected]>

* Compile

Signed-off-by: mramotar <[email protected]>

* Fix tests

Signed-off-by: mramotar <[email protected]>

* Stash M1

Signed-off-by: mramotar <[email protected]>

* Make Updater and Bookkeeper optional

Signed-off-by: Matt Ramotar <[email protected]>

* Add conflict resolution

Signed-off-by: Matt Ramotar <[email protected]>

* Cover simple write

Signed-off-by: Matt Ramotar <[email protected]>

* Add MutableStore

Signed-off-by: mramotar <[email protected]>

* Add RealMutableStore

Signed-off-by: mramotar <[email protected]>

* Update workflows

Signed-off-by: mramotar <[email protected]>

* Format

Signed-off-by: mramotar <[email protected]>

* Remove references to Market

Signed-off-by: mramotar <[email protected]>

* Remove Converter interface

Signed-off-by: mramotar <[email protected]>

* Move Converter typealias

Signed-off-by: mramotar <[email protected]>

* Remove Google copyright

Signed-off-by: mramotar <[email protected]>

* Update CHANGELOG.md

Signed-off-by: mramotar <[email protected]>

Signed-off-by: mramotar <[email protected]>
Signed-off-by: Matt Ramotar <[email protected]>
digitalbuddha pushed a commit that referenced this pull request Jan 16, 2023
* Stub Store write

Signed-off-by: mramotar <[email protected]>

* Format

Signed-off-by: mramotar <[email protected]>

* Compile

Signed-off-by: mramotar <[email protected]>

* Fix tests

Signed-off-by: mramotar <[email protected]>

* Stash M1

Signed-off-by: mramotar <[email protected]>

* Make Updater and Bookkeeper optional

Signed-off-by: Matt Ramotar <[email protected]>

* Add conflict resolution

Signed-off-by: Matt Ramotar <[email protected]>

* Cover simple write

Signed-off-by: Matt Ramotar <[email protected]>

* Add MutableStore

Signed-off-by: mramotar <[email protected]>

* Add RealMutableStore

Signed-off-by: mramotar <[email protected]>

* Update workflows

Signed-off-by: mramotar <[email protected]>

* Format

Signed-off-by: mramotar <[email protected]>

* Remove references to Market

Signed-off-by: mramotar <[email protected]>

* Remove Converter interface

Signed-off-by: mramotar <[email protected]>

* Move Converter typealias

Signed-off-by: mramotar <[email protected]>

* Remove Google copyright

Signed-off-by: mramotar <[email protected]>

* Update CHANGELOG.md

Signed-off-by: mramotar <[email protected]>

Signed-off-by: mramotar <[email protected]>
Signed-off-by: Matt Ramotar <[email protected]>
digitalbuddha pushed a commit that referenced this pull request Jan 16, 2023
* Stub Store write

Signed-off-by: mramotar <[email protected]>

* Format

Signed-off-by: mramotar <[email protected]>

* Compile

Signed-off-by: mramotar <[email protected]>

* Fix tests

Signed-off-by: mramotar <[email protected]>

* Stash M1

Signed-off-by: mramotar <[email protected]>

* Make Updater and Bookkeeper optional

Signed-off-by: Matt Ramotar <[email protected]>

* Add conflict resolution

Signed-off-by: Matt Ramotar <[email protected]>

* Cover simple write

Signed-off-by: Matt Ramotar <[email protected]>

* Add MutableStore

Signed-off-by: mramotar <[email protected]>

* Add RealMutableStore

Signed-off-by: mramotar <[email protected]>

* Update workflows

Signed-off-by: mramotar <[email protected]>

* Format

Signed-off-by: mramotar <[email protected]>

* Remove references to Market

Signed-off-by: mramotar <[email protected]>

* Remove Converter interface

Signed-off-by: mramotar <[email protected]>

* Move Converter typealias

Signed-off-by: mramotar <[email protected]>

* Remove Google copyright

Signed-off-by: mramotar <[email protected]>

* Update CHANGELOG.md

Signed-off-by: mramotar <[email protected]>

Signed-off-by: mramotar <[email protected]>
Signed-off-by: Matt Ramotar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants