Hello everybody,
I have discovered a scenario when svn merge --reintegrate results in a false
text conflict set on a binary file.
The scenario is simple:
1. add any binary file to the trunk,
2. create a branch from the trunk,
3. modify the binary at the trunk,
4. merge changes from trunk to the
Hello everybody,
I have discovered a scenario when svn merge --reintegrate results in a false
text conflict set on a binary file.
The scenario is simple:
1. add any binary file to the trunk,
2. create a branch from the trunk,
3. modify the binary at the trunk,
4. merge changes from trunk to the
