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

Add changeset conflict handler to IModelDb #6437

Merged
merged 6 commits into from
Feb 21, 2024
Merged

Add changeset conflict handler to IModelDb #6437

merged 6 commits into from
Feb 21, 2024

Conversation

khanaffan
Copy link
Contributor

@khanaffan khanaffan commented Feb 13, 2024 •
edited
Loading

  1. Add typescript changeset and apply conflict hander to make it easy to update it.
  2. This PR also fixes a reported issue where indirect change was causing data conflict.

imodel-native: iTwin/imodel-native#618

@khanaffan khanaffan mentioned this pull request Feb 13, 2024
Merged
@khanaffan khanaffan marked this pull request as ready for review February 13, 2024 18:29
@khanaffan khanaffan requested a review from a team as a code owner February 13, 2024 18:29
pmconne
pmconne reviewed Feb 13, 2024
View reviewed changes
Copy link
Member

@pmconne pmconne left a comment

Choose a reason for hiding this comment

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

Some tests seem warranted.

@khanaffan
move onConflictHandler to BriefcaseDb.
1208dd9 
update existing test to test for if onChangesetConflict  call is handled by BriefcaseDb.onChangesetConflict
@khanaffan
update test
5efabcf
@khanaffan
added test
e2d58a0
@khanaffan khanaffan merged commit 918ffab into imodel02 Feb 21, 2024
10 of 11 checks passed
@khanaffan khanaffan deleted the affanK/add-support-for-ts-conflict-handler branch February 21, 2024 19:00
@nick4598
Copy link
Contributor

@Mergifyio backport release/4.4.x

@mergify Mergify
Copy link
Contributor

mergify bot commented Mar 21, 2024 •
edited
Loading

backport release/4.4.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Mar 21, 2024
@khanaffan @mergify
Add changeset conflict handler to IModelDb (#6437)
840a24e 
Co-authored-by: Affan Khan <khanaffan@users.noreply.github.com>
(cherry picked from commit 918ffab)
This was referenced Mar 21, 2024
Merged
Merged
nick4598 added a commit that referenced this pull request Mar 27, 2024
@mergify @khanaffan @nick4598
Add changeset conflict handler to IModelDb (backport #6437) [release/…
8236cb3 
…4.4.x] (#6546)

Co-authored-by: affank <khanaffan@gmail.com>
Co-authored-by: Nick Tessier <22119573+nick4598@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nick4598 nick4598 nick4598 left review comments

@pmconne pmconne pmconne approved these changes

@ColinKerr ColinKerr ColinKerr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@khanaffan @nick4598 @pmconne @ColinKerr