Loading...

XML

Word

Printable

Details

Type: Bug
Resolution: Fixed
Priority: Major
Fix Version/s: 13.3-rc-1, 12.10.7
Affects Version/s: 11.8-rc-1
Component/s: Web - Templates & Resources
Labels:
None

Difficulty:
Unknown
Documentation:
N/A
Documentation in Release Notes:
N/A
Similar issues:

Description

The conflict windows keeps appearing again and again when selecting "Fix each conflict individually" and clicking save.

Attachments

Attachments

- Sort By Name
- Sort By Date
- Ascending
- Descending
- Thumbnails
- List
- Download All

TestConflict.WebHome(2).xar
1 kB
12/Apr/21 10:32
TestConflict.WebHome(1).xar
1 kB
12/Apr/21 09:59
TestConflict.WebHome.xar
2 kB
08/Apr/21 11:00
screenshot-9.png
72 kB
12/Apr/21 10:11
screenshot-8.png
54 kB
09/Apr/21 17:14
screenshot-7.png
158 kB
09/Apr/21 00:05
screenshot-6.png
82 kB
07/Apr/21 16:32
screenshot-5.png
28 kB
07/Apr/21 16:32
screenshot-4.png
75 kB
07/Apr/21 16:32
screenshot-11.png
123 kB
12/Apr/21 11:30
screenshot-10.png
127 kB
12/Apr/21 10:37
conflict-test.png
66 kB
08/Apr/21 11:01
Capture d’écran_2021-04-12_10-49-46.png
112 kB
12/Apr/21 10:50
20210331 Edit Conflict Edit Separately.gif
2.89 MB
07/Apr/21 16:32

Issue Links

is related to

XWIKI-18465 Saving Impossible And No Error/Warning Message Whatsoever in Case Of Edit Conflict

Closed

XWIKI-16464 Merge conflict: allow choice by chunks and custom fixes

Closed

Activity

People

Assignee:: Simon Urli

Reporter:: Gunter Ohrner

Votes:: 0 Vote for this issue

Watchers:: 2 Start watching this issue

Dates

Created:: 07/Apr/21 16:28

Updated:: 12/Apr/21 12:13

Resolved:: 12/Apr/21 12:13

Date of First Response:: 07/Apr/21 4:30 PM