search

fork-dev / Tracker

Bug and issue tracker for Fork for Mac
494 stars 12 forks source link

Conflict resolution UI should show base #2079

Open carlosefonseca opened 4 months ago

carlosefonseca commented 4 months ago

Hi! Tried to find an issue related to this but couldn't find one.

The conflict resolution window shows conflicts as changes on the left and on the right. While I might know about my changes, I might not be aware of the remote changes that someone else made. And the UI does not show me what they changed, only that the lines changed.

For instance, the following screenshot shows a conflict because something changed on the remote (right side) but looking at it I don't understand what changed because I don't have the base version to compare to.

CleanShot 2024-03-02 at 20 51 46

I can open the repo in Android Studio / InteliJ and it shows me the base in the middle so I can understand what changed in each side. Turns out it was just the amount of leading whitespace that changed.

CleanShot 2024-03-02 at 20 58 39

I'd love to see Fork improve on this since it's so great at everything else. I feel kind of bad when I have to open Android Studio of all things to help me merge some more complex conflicts 😅

Cheers!

DanPristupov commented 4 months ago

What layout would you propose in the 3-column view?

Screenshot 2024-03-02 at 22 07 20