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

feat(Insomnia Sync): add diff view on conflict resolution and handle cancelation #7175

Merged
merged 2 commits into from
Mar 13, 2024
Merged

feat(Insomnia Sync): add diff view on conflict resolution and handle cancelation #7175

merged 2 commits into from
Mar 13, 2024

Conversation

gatzjames
Copy link
Contributor

Highlights:

  • Adds a diff view (similar to commitng changes) in the conflict resolution modal
  • Handle the error case when closing the conflict modal and abort conflict resolution

@gatzjames gatzjames requested a review from a team March 13, 2024 10:06
@gatzjames gatzjames self-assigned this Mar 13, 2024
@gatzjames gatzjames merged commit 21ce0ba into Kong:develop Mar 13, 2024
7 checks passed
@gatzjames gatzjames deleted the feat/sync-conflict-diff-view branch March 13, 2024 11:45
jackkav pushed a commit to jackkav/insomnia that referenced this pull request Mar 13, 2024
@gatzjames @jackkav
feat(Insomnia Sync): add diff view on conflict resolution and handle …
3855922 
…cancelation (Kong#7175)

* add diff view on conflict resolution and handle errors

* fix types
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackkav jackkav jackkav approved these changes

Assignees

@gatzjames gatzjames

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gatzjames @jackkav