If you want to see the differences between your file and the conflicting file, you can use the oxen diff command.

Oxen knows how to compare text files as well as tabular data between commits. Currently, you must specify the specific path to the file you want to compare the changes.

If the file is tabular data oxen diff will show you the rows that were added or removed.

First use the oxen df command to add a row to the data frame.

oxen df annotations/data.csv --add-row 'images/my_cat.jpg,cat,0,0,0,0' -o annotations/data.csv

Then use the oxen diff command to see the changes.

oxen diff annotations/data.csv

diff add row

If the tabular data schema has changed oxen diff will flag and show you the columns that were added.

Add a new column to the data frame.

oxen df annotations/data.csv --add-col 'is_fluffy:unknown:str' -o annotations/data.csv

Then use the oxen diff command to see the changes.

oxen diff annotations/data.csv

diff add col

If the file is any other type of text data, it will simply show you the added and removed lines.

oxen diff path/to/file.txt

 i
+here
 am a text file that
+I am modifying
-la-dee-da
+la-doo-da
+another line
SchemasRemote Workspace