Track Changes - merge : Handle merge contribution changes edge cases - I
SUMMARY
Follow-up on testing comments present on #1316 (closed)
- Handle moved elements mixed with/without Track Changes
- Matching of text
- Display message when not possible to merge
Here are the 5 issues solved in this ticket
- trying to merge below, getting success message although but it is not being merged with track changes
- there is move of point between different article. i selected one paragraph with accept changes and another with accept change with track changes. which one should be priortise. Both is not working well. below is the result.
- how to handle below situation? if the content is removed from original proposal but changes present in contribution pane.
- "See track changes" will hide or show track changes on left pane (main document) and same about contribution pane. Track changes should always been showed on contribution pane even though "See track changes" flag is off
- When "See track changes" is off, move labels are still displayed. It should not