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.

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

annotation: avoid comment conflict warning when irrelevan #10799

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

lpranam
Copy link
Member

@lpranam lpranam commented Dec 24, 2024

  • Target version: master

Checklist

  • I have run make prettier-write and formatted the code.
  • All commits have Change-Id
  • I have run tests with make check
  • I have issued make run and manually verified that everything looks okay
  • Documentation (manuals or wiki) has been updated or is not required

problem:
when a user is editing comment and makes some changes to the document
text which moves the comment, user used to get comment conflict dialog
without any real changes to comment which confused users

Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Ifc6cbe51bc7caecb02a6ac099e6530dded45743b
avoid comment conflict dialog when changes are done by current user itself

problem:
when autosaved comments are still in edit mode and user undo the comment action
user used to get warning "another user removed comment"

Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I8578443f6f4e31f441c9e8ce4c77ec276d9a5d6a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: To Review
Development

Successfully merging this pull request may close these issues.

1 participant