we use SourceSafe (6) for version control.
In one scenario 2 developers started separate development paths on one project. We used SourceSafe's branching feature for this.
Now, when the developers want to merge those branches, they ran into a problem with FRX files. SourceSafe does not support merging of binary files.
I guess the same would happen with RES files.

Does anyone have a good solution or hint for this problem?