Wiki source code of Diff Conflict

Last modified by Vincent Massol on 2024/11/19 16:12

version	line-number	content
1.2	1	{{velocity}}
	2	$xwiki.ssx.use("Improvements.WebHome")
	3	$xwiki.ssx.use("Standards.WebHome")
	4	{{/velocity}}
1.3	5
	6	== Community Feedback ==
	7
	8	{{info}}
	9	[UX][Proposal]
	10	{{/info}}
1.4	11
2.3	12	== Conflicts Resolution ==
1.4	13
	14	(% class="left column45 dashboardleft" style="margin-right: 5%;" %)
	15	(((
2.5	16	* accepting a certain line by clicking on 'Accept' icon
	17	* the line is removed in recent versions
2.2	18	[[[[image:step1.png\|\|style="border: 1px dotted #DFDFF2; max-width: 100%;"]]>>attach:step1.png]]
1.4	19	)))
	20
	21	(% class="left column45 dashboardright" %)
	22	(((
2.5	23	* after accepting the change, the change is marked as accepted (yellow background) but the initial state is preserved (initially deleted mark)
2.2	24	[[[[image:step2.png\|\|style="border: 1px dotted #DFDFF2; max-width: 100%;"]]>>attach:step2.png]]
1.4	25	)))
	26
4.2	27	(% class="clearfloats" %)
	28	(((
2.2	29
4.2	30	)))
	31
2.2	32	(% class="left column45 dashboardleft" style="margin-right: 5%;" %)
	33	(((
2.8	34	* batch changes (2 lines) are accepted as group
2.2	35	[[[[image:step3.png\|\|style="border: 1px dotted #DFDFF2; max-width: 100%;"]]>>attach:step3.png]]
	36	)))
	37
	38	(% class="left column45 dashboardright" %)
	39	(((
2.8	40	* you can edit the accepted version in order to resolve the conflict
2.2	41	[[[[image:step4.png\|\|style="border: 1px dotted #DFDFF2; max-width: 100%;"]]>>attach:step4.png]]
	42	)))
	43
4.2	44	(% class="clearfloats" %)
	45	(((
	46
	47	)))

About