Page MenuHomePhabricator

Add clickable arrows to add your version above or below current
Open, Needs TriagePublic

Description

The current two-column approach is way better than the old one. But still there is not so much difference between old and new approach.

I like to use Meld (http://meldmerge.org/) to compare files and its approach is really cool. Please see screenshot below:


The arrows are clickable and do what you expect to.

Maybe we should inspire of this piece of software and take a similar approach. Let's say the compare from the screenshot above is an edit conflict. I edited the example screenshot and added some arrows useful for edit confilcts:


These clickable arrow buttons adding my text above or under conflicting part by another user would really help with resolving edit conflicts I think.

Event Timeline

Dvorapa created this task.Jun 30 2017, 10:47 PM
Restricted Application added a project: TCB-Team. · View Herald TranscriptJun 30 2017, 10:47 PM
Restricted Application added a subscriber: Aklapper. · View Herald Transcript
Dvorapa updated the task description. (Show Details)Jun 30 2017, 10:47 PM
Dvorapa updated the task description. (Show Details)
Dvorapa updated the task description. (Show Details)

This feature now starts to be interesting (after new design was released). The edit buttons are ok, but what if I want to keep both versions and just set their order? Like if two people add a sentence/paragraph, I want to be able to keep both, just place my paragraph under or above his/her. Currently I have to edit his version and copy my version in there. Two arrow icons would make the issue much easier.

Dvorapa updated the task description. (Show Details)Nov 16 2018, 2:21 PM
Dvorapa updated the task description. (Show Details)
Dvorapa updated the task description. (Show Details)