Merge conflict highlight #56

notramo · 2024-01-16T10:23:29Z

Please add an option to pass only one file to riff, and if it contains merge conflicts, highlight the differences between the 2 chunks.

The text was updated successfully, but these errors were encountered:

walles · 2024-01-18T08:11:05Z

Two examples, just to see that we're on the same page.

Both examples show the same conflicting changes in branch johan being merged into branch main.

Merge was done with git merge --no-ff johan while on the main branch.

These diffs were done using just git diff after git merge complained about conflicts.

Without `diff3` Conflict Style

diff --cc file.txt
index e22c6dd,043d9e8..0000000
--- file.txt
+++ file.txt
@@@ -1,20 -1,20 +1,43 @@@
++<<<<<<< HEAD
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
++=======
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
++>>>>>>> johan

With `diff3` Conflict Style

diff --cc file.txt
index e22c6dd,043d9e8..0000000
--- file.txt
+++ file.txt
@@@ -1,20 -1,20 +1,64 @@@
++<<<<<<< HEAD
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
 +This is what the file looks like after being modified in the main branch.
++||||||| bee31e4
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++This is what the file looks like initially.
++=======
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
+ This is what the file looks like in Johan's branch.
++>>>>>>> johan

notramo · 2024-01-20T19:56:25Z

I want to use it to quickly overview what changed in 2 huge hunks. The git merge tool puts merge markers inside the files. There is no + or - sign in the files, only thee <<<<<<<<, ========, and >>>>>>>> lines. I would like to see the diff between the 2 conflicting content to quickly decide how to resolve it. So no + and - needed as in the diff format, however, that can be useful for other use cases too.

0x5c · 2024-01-21T00:16:30Z

I'm interested in this too, it would be even more useful than conflict rendering in most editors

Please add an option to pass only one file to riff

That functionality is already in riff as the -f/--file option since 2.26.0

walles · 2024-01-21T08:18:42Z

There is no + or - sign in the files

There is actually, if you do git diff after git tells you there's a conflict.

So I think as @classabbyamp was onto there are really two sort of related things riff could potentially be doing:

Stick to only highlighting diffs. In that case, riff would highlight the git diff output when there are conflicts, but riff < file-with-conflict-markers.rs would not.
Highlight random files containing conflict markers (riff < file-with-conflict-markers.rs).

I will treat this ticket as a request for 2.

classabbyamp · 2024-01-22T09:59:39Z

perhaps blue would be good for highlighting the <<<<<<<</=========/>>>>>>>>

walles · 2024-01-24T13:03:22Z

Here's what I came up with.

The two way merge conflict sections are just compared to each other, with the first being "old" and the second "new".

In the diff3 case, additions relative base is highlighted in sections C1 and C2. In base, anything having been removed in either C1 or C2 will be highlighted. Not sure how to highlight base really but this is something.

notramo · 2024-01-24T13:54:47Z

@walles thanks for implementing this feature so quickly. I work on a project where the differences are hard to spot because no autoformatter has been set up, so this feature is really useful.

walles · 2024-02-05T05:38:06Z

@notramo I just had real world use for this myself and it made the conflict much easier to understand.

Thanks for reporting! :)

This comment was marked as off-topic.

Sign in to view

classabbyamp mentioned this issue Jan 22, 2024

combined git diff highlighting #57

Closed

walles closed this as completed in 1e08af5 Jan 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge conflict highlight #56

Merge conflict highlight #56

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

Merge conflict highlight #56

Merge conflict highlight #56

Comments

This comment was marked as off-topic.

Without diff3 Conflict Style

With diff3 Conflict Style

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

Without `diff3` Conflict Style

With `diff3` Conflict Style