Currently commits with a conflict return an error somewhere in the VFS. Consider supporting viewing conflicting files within the VFS
Currently commits with a conflict return an error somewhere in the VFS. Consider supporting viewing conflicting files within the VFS