Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR should implement a working
Core.SyncAll()method, which will try to synchronize all calendars with its remotes.SyncAlldoes for each calendar:a. Same hashes -> nothing to be done
b. "Remote head" is ahead -> fast-forward merge aka. append changes to local
c. Local head is ahead -> push new commits to remote
d. History diverged -> custom merge strategy -> push merge commit
Merge conflict resolution strategy
Obvious
Not so obvious
UpdatedAtwinsUpdatedAtwins