63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
+
+
|
fossil_fatal("abort due to unresolved merge conflicts; "
"use --allow-conflict to override");
```
The corresponding code in libf looks *much* different than that now, and it's not currently (2021-09-17) clear whether or how that change would need to apply to libf's impl.
## Status and Symlinks
(Added 2024-07-22)
There's a slight inconsistency in "status" results vis a vis fossil(1) when using a symlink. In the admittedly odd case below, there's a checkout of project X on my hard drive, and another to that same checkout on a RAM disk. In order to avoid data loss if my system crashes, the file being worked on in the RAM disk is a symlink to a file from the on-hard-drive checkout:
```
[stephan@nuc:/home/ram/stephan/foo]$ l XYZ.test
lrwxrwxrwx 1 stephan stephan 39 Jul 19 15:41 XYZ.test -> /home/stephan/.../XYZ.test
```
|