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.

Sign up for GitHub

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

Jump to bottom

Refactor automerge from connect.js to its own file #4

Open
DMGregory opened this issue Nov 18, 2021 · 0 comments
Open

Refactor automerge from connect.js to its own file #4

DMGregory opened this issue Nov 18, 2021 · 0 comments
Assignees
@michaelpalumbo @DMGregory
Labels
merge Use for issues about combining work from multiple branches/sources

Comments

@DMGregory
Copy link
Contributor

@michaelpalumbo and @DMGregory are working on taking the automerge handling from connect.js in the automerge branch, and integrating it into the latest develop branch as a reusable utility.
@DMGregory DMGregory added the merge Use for issues about combining work from multiple branches/sources label Nov 18, 2021
DMGregory added a commit that referenced this issue Nov 18, 2021
@DMGregory
Initial sketch of merge.js for #4
a2f9f9a
DMGregory added a commit that referenced this issue Nov 18, 2021
@DMGregory
merge as function, not class #4
5d4bcc5
DMGregory added a commit that referenced this issue Nov 18, 2021
@DMGregory
Example applyChange #4
ffc764f
DMGregory added a commit that referenced this issue Nov 18, 2021
@DMGregory
Sketch of sync message handling #4
6846186
DMGregory added a commit that referenced this issue Nov 23, 2021
@DMGregory
Server automerge setup #4
1dcae5f
DMGregory added a commit that referenced this issue Nov 23, 2021
@DMGregory
Stub client automerge handling #4
dc667d6
DMGregory added a commit that referenced this issue Nov 23, 2021
@DMGregory
Sync loop - currently broken #4
0c2ca06
DMGregory added a commit that referenced this issue Nov 23, 2021
@DMGregory
Fixed formatting erros (kludge) #4
b7f1115
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@michaelpalumbo michaelpalumbo

@DMGregory DMGregory

Labels
merge Use for issues about combining work from multiple branches/sources
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@michaelpalumbo @DMGregory