Improve entry merge dialog (3-way merge)

- [ ] Add option to show only differences
- [ ] Emphasize header (e.g. bold and with different background) as in ![](https://docs.servicenow.com/bundle/geneva-release-notes/page/build/team_development/image/CompareToCurrentForm.png)
- [ ] Concert to 3-way merge: the two entries to be merged on the left and right, in the mid the final merged entry. The values of the merged entry in the center should be editable (i.e. text fields). Similar to 
   ![](http://meldmerge.org/images/meld-merge-full.png) ![](http://www.deltawalker.com/compare-files/images/three-way-comparison-before.jpg)
	- Further Inspiration:
		- ![](https://www.elsevier.com/__data/assets/image/0007/100150/2-Librarian-Merge.jpg)
		- ![](https://cdn.css-tricks.com/wp-content/uploads/2014/04/03-merge-conflict-in-gui.jpg)
		- ![](https://www.oxygenxml.com/img/archive_diff_dirs_big.png)
                - http://baymard.com/ecommerce-product-lists/benchmark/page-types/comparison-tool


Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Improve entry merge dialog (3-way merge) #6190

Metadata

Assignees

Labels

Type

Fields

Projects

Milestone

Relationships

Development

Uh oh!

Improve entry merge dialog (3-way merge) #6190

Description

Metadata

Metadata

Assignees

Labels

Type

Fields

Projects

Milestone

Relationships

Development

Issue actions