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

Support rebasing local changes on top of master/incoming changes #6662

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Support rebasing local changes on top of master/incoming changes #6662

wants to merge 4 commits into from
+130 −235

Conversation

khanaffan
Copy link
Contributor

@khanaffan khanaffan commented Apr 23, 2024 •
edited

  1. Move conflict handler to TxnManager. Its only called in case of "Rebase" change integration method as nothing important can be done when we use merge method.
  2. Added following callbacks that allow application to make flexible changes when reapplying local txn when rebasing.
    • _onRebaseBeginLocalTxn()
    • onRebaseEndLocalTxn()
  3. SqliteChangeset allow to open local txn by Id.

imodel-native:iTwin/imodel-native#737

@khanaffan khanaffan mentioned this pull request Apr 23, 2024
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@khanaffan